diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b9fef8bb08..78e2473e373 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* custom.el (defcustom): Add edebug spec.
+
 2010-04-18  Juri Linkov  <juri@jurta.org>
 
 	Test for special mode-class in view-buffer instead of view-file (bug#5513).
diff --git a/lisp/custom.el b/lisp/custom.el
index 2484ee26f21..726f70492b3 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -304,7 +304,7 @@ _outside_ any bindings for these variables.  \(`defvar' and
 
 See Info node `(elisp) Customization' in the Emacs Lisp manual
 for more information."
-  (declare (doc-string 3))
+  (declare (doc-string 3) (debug (name body)))
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.