diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bd2e9d3835..8be0d110d07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-01  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (confirm-nonexistent-file-or-buffer): `other' must be last
+	custom choice.  (Bug#2506)
+
 2009-02-28  Eli Zaretskii  <eliz@gnu.org>
 
 	* progmodes/grep.el (grep-process-setup) [windows-nt msdos]: Use
diff --git a/lisp/files.el b/lisp/files.el
index da8db21274b..afe6b4c3b63 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1138,9 +1138,9 @@ Any other non-nil value means to request confirmation.
 This affects commands like `switch-to-buffer' and `find-file'."
   :group 'find-file
   :version "23.1"
-  :type '(choice (other :tag "Always" t)
-		 (const :tag "After completion" after-completion)
-		 (const :tag "Never" nil)))
+  :type '(choice (const :tag "After completion" after-completion)
+		 (const :tag "Never" nil)
+		 (other :tag "Always" t)))
 
 (defun confirm-nonexistent-file-or-buffer ()
   "Whether to request confirmation before visiting a new file or buffer.