diff --git a/README b/README
index d007dd5073a9530e9f5fd40797d0f518b854f5e1..710a925dfd0dc2d8ae0704ac69841b68850374f2 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ pike-request@roxen.com
 
 HOW TO BUILD PIKE
 
-If you are building Pike from the CVS, read README-CVS instead.
+If you are building Pike from git, read README-GIT instead.
 
 The top-level makefile (in this directory, not the src directory) has
 all the magic you need to build Pike. Just type 'make'.
@@ -21,7 +21,7 @@ To install type "make install" or "make install_interactive".
 You will need gnu m4, bison and a C compiler. You probably also want
 to use GNU make and libz.
 
-If that doesn't work, refer to README-CVS, in particular the sections
+If that doesn't work, refer to README-GIT, in particular the sections
 on additional "DEPENDENCIES", on "CONFIGURE OPTIONS AND BUILD VARIABLES",
 on "MANUAL BUILDING" and, if needed, the section "IF IT DOESN'T WORK".
 
diff --git a/lib/modules/Calendar.pmod/mkrules.pike b/lib/modules/Calendar.pmod/mkrules.pike
index ab8fe99dfce6ac1e3c256a69a96e9e515a679a49..cea74c60d1031b18a62e3a0c2959b54f161f6821 100644
--- a/lib/modules/Calendar.pmod/mkrules.pike
+++ b/lib/modules/Calendar.pmod/mkrules.pike
@@ -730,7 +730,7 @@ int main(int ac,array(string) am)
       files = get_dir(combine_path(__FILE__, "../tzdata"));
       files = map(sort(files),
 		  lambda(string fname) {
-		    if ((< "CVS", "factory", "leapseconds", >)[fname] ||
+		    if ((< "factory", "leapseconds", >)[fname] ||
 			has_prefix(fname, "solar") ||
 			has_suffix(fname, ".sh") ||
 			has_suffix(fname, ".tab")) return 0;
diff --git a/src/export_list b/src/export_list
index 4f0d26167928846cb6cfc5f8db3719ebda77bb53..863a6433439c47ebcb88eb1f7cbe055435f822bf 100644
--- a/src/export_list
+++ b/src/export_list
@@ -2,7 +2,7 @@
 # added to source dists. Used by bin/export.pike.
 
 /README
-/README-CVS
+/README-GIT
 /ANNOUNCE
 /CHANGES
 /COMMITTERS