diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c57c4c428a..b9ea32df462 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-22  Markus Rost  <markus.rost@mathematik.uni-regensburg.de>
+
+	* comint.el (comint-password-prompt-regexp): Support CVS.
+
 2000-12-22  Gerd Moellmann  <gerd@gnu.org>
 
 	* simple.el (delete-key-deletes-forward-mode): Simplify.  Also
diff --git a/lisp/comint.el b/lisp/comint.el
index 33595103a01..4e6d852fe94 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -312,7 +312,7 @@ This variable is buffer-local."
 ;; ssh-add prints a prompt like `Enter passphrase: '.
 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
 (defcustom comint-password-prompt-regexp
-  "\\(\\([Oo]ld \\|[Nn]ew \\|Kerberos \\|'s \\|login \\|^\\)\
+  "\\(\\([Oo]ld \\|[Nn]ew \\|Kerberos \\|'s \\|login \\|CVS \\|^\\)\
 [Pp]assword\\( (again)\\)?\\|pass phrase\\|Enter passphrase\\)\
 \\( for [^@ \t\n]+@[^@ \t\n]+\\)?:\\s *\\'"
   "*Regexp matching prompts for passwords in the inferior process.