diff --git a/Makefile b/Makefile
index a22e2490b6..5011685e3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/05]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/11]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
@@ -2473,6 +2473,7 @@ demosrcinstall:
 	$(MAKE) -C demo clean
 	$(MKDIR) $(DEMOSOURCEDIR)
 	$(COPYTREE) demo/* $(DEMOSOURCEDIR)
+	find $(DEMOSOURCEDIR) -name 'CVS' | xargs -n1 rm -rf
 demozip:
 	$(MAKE) fpc_zipinstall ZIPTARGET=demosrcinstall FULLZIPNAME=demo
 .PHONY: sourcebase sourcezip
diff --git a/Makefile.fpc b/Makefile.fpc
index 83fdc4d590..5346d6b990 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -405,6 +405,7 @@ demosrcinstall:
         $(MAKE) -C demo clean
         $(MKDIR) $(DEMOSOURCEDIR)
         $(COPYTREE) demo/* $(DEMOSOURCEDIR)
+        find $(DEMOSOURCEDIR) -name 'CVS' | xargs -n1 rm -rf
 
 demozip:
         $(MAKE) fpc_zipinstall ZIPTARGET=demosrcinstall FULLZIPNAME=demo