diff --git a/Makefile b/Makefile
index 6b79e308ac406054213cf243f1407242bb24f346..91099b055dca12c14a9fe72643b643fcb02f9e28 100644
--- a/Makefile
+++ b/Makefile
@@ -411,11 +411,13 @@ srcclean:
 	  else :; fi; \
 	done
 
-cvsclean: srcclean distclean docspotless
+gitclean: srcclean distclean docspotless
 	-rm -rf build
 	-rm -f export_result.txt
 	-rm -f Pike*.tar.gz
 
+cvsclean: gitclean
+
 delete_docs:
 	-rm -rf "$(BUILDDIR)/doc_build"
 	-rm -f "$(BUILDDIR)/autodoc.xml"
diff --git a/src/Makefile.in b/src/Makefile.in
index 9d2408b49a5b30ba0b58d1f502f7e42f2d42058d..077a60eb79090a6b8efeb8f9405f448d54117edb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -731,7 +731,8 @@ spotless: clean_here clean_pike
 
 distclean: spotless
 
-cvsclean: distclean
+# FIXME: Use .gitignore instead.
+gitclean: distclean
 	( for d in `cd $(SRCDIR) && find . -type d -print`; do \
 	    if test -f "$(SRCDIR)/$$d/.cvsignore" ; then \
 	      (cd "$$d" && rm -f `cat "$(SRCDIR)/$$d/.cvsignore"`); \
@@ -739,6 +740,8 @@ cvsclean: distclean
 	    else :; fi; \
 	  done)
 
+cvsclean: gitclean
+
 # create tags
 tags:
 	ctags *.c