diff --git a/Makefile.in b/Makefile.in
index 6b3b28e5..7a672fb4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,7 +100,7 @@ TAGS:
 
 dist: $(srcdir)/configure DISTFILES
 	mkdir $(DISTNAME)
-	for d in `$(FIND) . -type d ! -name RCS -print`; do \
+	for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
 		if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
 			mkdir $(DISTNAME)/$$d; \
 		fi; \
@@ -117,7 +117,7 @@ dist: $(srcdir)/configure DISTFILES
 DISTFILES: FORCE
 	rm -rf $(DISTNAME)	
 	(cd $(srcdir); find . ! -type d -print) \
-	| sed '/\/RCS\//d; \
+	| sed '/\/\(CVS\|RCS\)\//d; \
 		/$@/d; \
 		/\.tar.*/d; \
 	  	s/^.\///; /^\.$$/d;' \