diff --git a/contrib/cvs/src/classify.c b/contrib/cvs/src/classify.c
index 0ec8d4ead451..bae2a9b62562 100644
--- a/contrib/cvs/src/classify.c
+++ b/contrib/cvs/src/classify.c
@@ -41,6 +41,7 @@ keywords_may_change (aflag, vers)
 		 * changed by -A...
 		 */
 		|| (strlen (vers->entdata->options)
+		    && strcmp (vers->entdata->options, vers->options)
 		    && strcmp (vers->entdata->options, "-kkv")
 		    && strcmp (vers->entdata->options, "-kb"))))
 	/* ...or...  */