diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5ca53e9f4a..c8db50ac3bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-29  Glenn Morris  <rgm@gnu.org>
+
+	* pcmpl-cvs.el (pcomplete/cvs): Add "status" handler.
+
 2011-09-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* descr-text.el (describe-char-categories): Accept category
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 3ff07bca20e..9c9b72ab701 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -107,6 +107,10 @@
 		    "j(pcmpl-cvs-tags '(?U ?P))"
 		    "I(pcmpl-cvs-entries '(??))W?"))
 	   (while (pcomplete-here (pcmpl-cvs-entries '(?U ?P)))))
+	  ((pcomplete-test "status")
+	   (setq pcomplete-help "(cvs)File status")
+	   (pcomplete-opt "vlR")
+	   (while (pcomplete-here (pcmpl-cvs-entries))))
 	  (t
 	   (while (pcomplete-here (pcmpl-cvs-entries)))))))