diff --git a/ChangeLog b/ChangeLog
index 7289771e2..832359f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-03-17  Clint Adams  <clint@zsh.org>
 
+	* 16847: Completion/Unix/Command/_cvs: complete multiple -j's after
+	cvs update.
+
 	* 16846: Completion/X/Command/_xdvi: complete .dvi.gz and .dvi.bz2
 	too.
 
diff --git a/Completion/Unix/Command/_cvs b/Completion/Unix/Command/_cvs
index 2e3288798..d4768ec73 100644
--- a/Completion/Unix/Command/_cvs
+++ b/Completion/Unix/Command/_cvs
@@ -552,7 +552,7 @@ _cvs_update () {
     '-k+[keyword]:keyword substitution:_cvs_k' \
     '(-D)-r+[specify revision]:tag:_cvs_revisions' \
     '(-r)-D+[specify date]:date:_cvs_D' \
-    '-j+[merge]:tag:_cvs_revisions' \
+    '*-j+[merge]:tag:_cvs_revisions' \
     '*-I+[ignore files]:file:_files' \
     '*-W+[wrapper specification]:spec:_files' \
     '*:file:_cvs_files'