diff --git a/ChangeLog b/ChangeLog
index 550694f86..3cbb900a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-20  Bart Schaefer  <schaefer@zsh.org>
+
+	* 12326: Completion/User/_cvs: Discard stderr of a command subst.
+
 2000-07-17  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* 12323: Src/hist.c: support "builtin" in HIST_NO_STORE check.
@@ -141,7 +145,7 @@
 	* 12201: Completion/User/_java: fix completion for jar. complete
 	package qualified class names. fix typos.
 
-2000-07-07  Bart Schaefer  <schaefer@brasslantern.com>
+2000-07-07  Bart Schaefer  <schaefer@zsh.org>
 
 	* 12193: configure.in, Src/Builtins/rlimits.mdd: Fix unnecessary
 	rebuilds of rlimits.o on platforms where getrlimit() is not found.
@@ -295,7 +299,7 @@
  	make a-a-i-n-h in menu selection work with one match; better undo
  	behaviour for menu selection
 	
-2000-06-27  Bart Schaefer  <schaefer@brasslantern.com>
+2000-06-27  Bart Schaefer  <schaefer@zsh.org>
 
 	* 12086: Doc/Zsh/compsys.yo: Move _use_lo doc into alphabetical
 	order; separate _files and _path_files for same reason.
diff --git a/Completion/User/_cvs b/Completion/User/_cvs
index 8e0a4fbb4..110b2520b 100644
--- a/Completion/User/_cvs
+++ b/Completion/User/_cvs
@@ -748,7 +748,7 @@ _cvs_modified_entries () {
     linedir="$match[1]"
     realdir=${(e)~linedir}
     [[ -f "$realdir"CVS/Entries ]] &&
-    [[ -n ${pat::="${(@j:|:)${(@)${(@)${(@)${(@)${(@)${(@M)${(@f)"$(<"$realdir"CVS/Entries)"}:#/*}#/}/\\/[^\\/]#\\///}%/[^/]#/[^/]#}:#${(j:|:)~${${${${(f)"$(LC_ALL=C builtin stat -gn +mtime -F '%a %b %e %T %Y' ${realdir}*(D))"}##*/}/ //}//(#m)[][*?()<|^~#\\]/\\$MATCH}}}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}"} ]] &&
+    [[ -n ${pat::="${(@j:|:)${(@)${(@)${(@)${(@)${(@)${(@M)${(@f)"$(<"$realdir"CVS/Entries)"}:#/*}#/}/\\/[^\\/]#\\///}%/[^/]#/[^/]#}:#${(j:|:)~${${${${(f)"$(LC_ALL=C builtin stat -gn +mtime -F '%a %b %e %T %Y' ${realdir}*(D) 2>/dev/null)"}##*/}/ //}//(#m)[][*?()<|^~#\\]/\\$MATCH}}}%%/*}//(#m)[][*?()<|^~#\\]/\\$MATCH}"} ]] &&
     _wanted files expl file _path_files -g "$pat"
   else
     _cvs_existing_entries