diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 896c74aee95..6bc3b329967 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-11  Glenn Morris  <rgm@gnu.org>
+
+	* ido.el (ido-mode): Initialize with custom-initialize-default.
+	(Bug#947).
+
 2008-09-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* replace.el (perform-replace): Don't set inhibit-read-only using
diff --git a/lisp/ido.el b/lisp/ido.el
index 7d28b101d35..4d786eb8e33 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -353,7 +353,7 @@ Setting this variable directly does not take effect;
 use either \\[customize] or the function `ido-mode'."
   :set #'(lambda (symbol value)
 	   (ido-mode value))
-  :initialize 'custom-initialize-set
+  :initialize 'custom-initialize-default
   :require 'ido
   :link '(emacs-commentary-link "ido.el")
   :set-after '(ido-save-directory-list-file