diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e0f9282bd3..c6be6d06d4b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-10  John Paul Wallington  <jpw@pobox.com>
+
+	* pcvs.el (defun-cvs-mode): Add `doc-string' decl.
+
 2008-08-08  Chong Yidong  <cyd@stupidchicken.com>
 
 	* battery.el (battery-echo-area-format, battery-status-function):
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 03eeee677e6..9b73fb292bd 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -757,7 +757,8 @@ clear what alternative to use.
 - NOARGS will get all the arguments from the *cvs* buffer and will
   always behave as if called interactively.
 - DOUBLE is the generic case."
-  (declare (debug (&define sexp lambda-list stringp ("interactive" interactive) def-body)))
+  (declare (debug (&define sexp lambda-list stringp ("interactive" interactive) def-body))
+	   (doc-string 3))
   (let ((style (cvs-cdr fun))
 	(fun (cvs-car fun)))
     (cond