diff --git a/Makefile.am b/Makefile.am
index d7b65c143..6c4be7490 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,20 +19,10 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 compile config.guess \
 ACLOCAL_AMFLAGS = -I m4
 
 dist-hook:
-	rm -rf `find $(distdir)/contrib -name CVS`
-	rm -rf `find $(distdir)/patches -name CVS`
-	rm -rf `find $(distdir)/examples -name CVS`
-	rm -rf `find $(distdir)/visualc -name CVS`
-	rm -rf `find $(distdir)/visualc/include -name CVS`
-	rm -rf `find $(distdir)/xgraph -name .cvsignore`
 	rm -rf `find $(distdir)/xgraph -name .deps`
-	rm -rf `find $(distdir)/xgraph -name CVS`
 	rm -rf `find $(distdir)/xgraph -name config.status`
 	rm -rf `find $(distdir)/xgraph -name config.log`
 	rm -rf `find $(distdir)/xgraph -name Makefile`
-	rm -rf `find $(distdir)/xgraph/bitmaps -name CVS`
-	rm -rf `find $(distdir)/xgraph/examples -name CVS`
-	rm -rf `find $(distdir)/unsupported -name CVS`
 
 mrproper: maintainer-clean
 	rm -f `find $(top_srcdir) -type f -name "*~" -print`
diff --git a/autogen.sh b/autogen.sh
index 7a73c1080..d1550a8d2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -165,9 +165,6 @@ $znew
         if [ -d "$ADMSDIR/$adms_dir" ]; then
 
             case "$adms_dir" in
-                "CVS")
-                    echo "Skipping CVS"
-                    ;;
 
                 "admst")
                     echo "Skipping scripts dir"
diff --git a/src/spicelib/Makefile.am b/src/spicelib/Makefile.am
index e2aca933f..227e8a6f6 100644
--- a/src/spicelib/Makefile.am
+++ b/src/spicelib/Makefile.am
@@ -5,8 +5,6 @@ EXTRA_DIST = README
 SUBDIRS = analysis parser devices
 
 dist-hook:
-	rm -rf `find $(distdir)/devices -name .cvsignore`
 	rm -rf `find $(distdir)/devices -name .deps`
-	rm -rf `find $(distdir)/devices -name CVS`
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/Makefile.am b/src/xspice/Makefile.am
index df2510794..ad2de1ea2 100644
--- a/src/xspice/Makefile.am
+++ b/src/xspice/Makefile.am
@@ -10,11 +10,8 @@ SUBDIRS = mif cm enh evt ipc idn cmpp icm
 
 
 dist-hook:
-	rm -rf `find $(distdir)/examples -name CVS`
 	rm -f "$(distdir)/icm/makedefs"
 	rm -f "$(distdir)/icm/GNUmakefile"
-	rm -rf `find $(distdir)/icm -name CVS`
-	rm -rf `find $(distdir)/icm -name .cvsignore`
 	rm -rf `find $(distdir)/icm -name .deps`
 	rm -rf `find $(distdir)/icm -name *.o`
 	rm -rf `find $(distdir)/icm -name *.cm`