diff --git a/GNUmakefile.in b/GNUmakefile.in
index 16f9057efe..eb48277abd 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -98,7 +98,7 @@ postgresql-test-$(VERSION).tar: distdir
 
 distdir:
 	-rm -rf $(distdir)* $(dummy)
-	for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+	for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
 	  file=`expr X$$x : 'X\./\(.*\)'`; \
 	  if test -d "$(top_srcdir)/$$file" ; then \
 	    mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file";	\
@@ -113,7 +113,7 @@ distdir:
 	cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
 	cp $(distdir)/doc/src/sgml/regress_README $(distdir)/src/test/regress/README
 	$(MAKE) -C $(distdir) distclean
-	rm -f $(distdir)/README.CVS
+	rm -f $(distdir)/README.git
 
 distcheck: $(distdir).tar.gz
 	-rm -rf $(dummy)
diff --git a/README.CVS b/README.git
similarity index 54%
rename from README.CVS
rename to README.git
index 37daaf6bc3..83b9a8c581 100644
--- a/README.CVS
+++ b/README.git
@@ -2,13 +2,13 @@
 
 In a release or snapshot tarball of PostgreSQL, documentation files named
 INSTALL and HISTORY will appear in this directory.  However, these files are
-not stored in CVS and so will not be present if you are using a CVS checkout.
-If you are using CVS, you can view the most recent install instructions at:
+not stored in git and so will not be present if you are using a git checkout.
+If you are using git, you can view the most recent install instructions at:
 	http://developer.postgresql.org/docs/postgres/installation.html
 and the current release notes at:
 	http://developer.postgresql.org/docs/postgres/release.html
 
-Users compiling from CVS will also need compatible versions of Bison and
-Flex, as discussed in the install documentation.  Bison and Flex are not
+Users compiling from git will also need compatible versions of Bison, Flex,
+and Perl, as discussed in the install documentation.  These programs are not
 needed when using a tarball, since the files they are needed to build are
-already present in the tarball.
+already present in the tarball.  (On Windows, however, you need Perl anyway.)