diff --git a/ChangeLog b/ChangeLog
index 0071b5ef4..41612071d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-23  Clint Adams  <clint@zsh.org>
+
+	* Matt Zimmerman: 17211: Completion/Unix/Command/_cvs:
+	respect $CVSIGNORE.
+
 2002-05-21  Peter Stephenson  <pws@csr.com>
 
 	* 17201: Doc/Zsh/mod_tcp.yo: add example use of ztcp.
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index a18044e90..765d7bdeb 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -965,6 +965,7 @@ _cvs_nonentried_files () {
     )
     [[ -r ~/.cvsignore ]] && omitpats=($omitpats $(<~/.cvsignore))
     [[ -r ${realdir}.cvsignore ]] && omitpats=($omitpats $(<${realdir}.cvsignore))
+    omitpats=($omitpats $CVSIGNORE)
 
     _path_files -g "*~(*/|)(${(j:|:)~omitpats})(D.)"
   }