diff --git a/.cvsignore b/.cvsignore
index 55d16f57..7e8cb999 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,4 @@
 .cvsignore
 .mfxcvsup
-ChangeLog
-ChangeLog.bak
+ChangeLog.cvs*
 maint
diff --git a/Makefile b/Makefile
index d28021a0..5c62b54d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ cvs-admin-ko:
 	cvs update
 
 ChangeLog:
-	perl scripts/cvs2cl.pl --utc
+	perl scripts/cvs2cl.pl --utc -f ChangeLog.cvs
 
 .PHONY: all clean distclean dist cvs-admin-ko ChangeLog