diff --git a/contrib/cvs/src/classify.c b/contrib/cvs/src/classify.c
index d8bf3996a43..0ec8d4ead45 100644
--- a/contrib/cvs/src/classify.c
+++ b/contrib/cvs/src/classify.c
@@ -34,7 +34,9 @@ keywords_may_change (aflag, vers)
 	    aflag
 	    /* ...and...  */
 	    && (/* ...there used to be a tag which subs in Name keys...  */
-		(vers->entdata->tag && !isdigit (vers->entdata->tag[0]))
+		(vers->entdata->tag && !isdigit (vers->entdata->tag[0])
+		    && vers->tag && !isdigit (vers->tag[0])
+		    && strcmp (vers->entdata->tag, vers->tag))
 		/* ...or there used to be a keyword mode which may be
 		 * changed by -A...
 		 */