diff --git a/ChangeLog b/ChangeLog
index 8c7e1a37a..8f1bea054 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-16  Tanaka Akira  <akr@zsh.org>
+
+	* 17459: Completion/Unix/Command/_cvs: exclude file which have
+	RCS kflags for cvs add.
+
 2002-07-08  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 17439: Src/Zle/zle_tricky.c: remove qword, it isn't needed
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 584e31f28..0a5646780 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -963,7 +963,7 @@ _cvs_nonentried_files () {
   realdir=${(e)~linedir}
   [[ -f "$realdir"CVS/Entries ]] && {
     omitpats=(
-      ${${${${(M)${${(f)"$(<"$realdir"CVS/Entries)"}:#/*/-*}:#(D|)/*}#(D|)/}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}
+      ${${${${(M)${${(f)"$(<"$realdir"CVS/Entries)"}:#/*/-*/*/*/*}:#(D|)/*}#(D|)/}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}
       $_cvs_ignore_default
       ${=cvsignore}
     )