diff --git a/Makefile.am b/Makefile.am
index ce8b230..1e9a380 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 	$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
 
 # These are all the possible subdirs
-DIST_SUBDIRS = common include libs gst tools tests testsuite examples docs
+DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
 
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -33,10 +33,11 @@
 	     gstreamer.pc.in gstreamer-uninstalled.pc.in \
 	     configure.ac autogen.sh depcomp \
 	     LICENSE REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING \
-	     idiottest.mak
+	     idiottest.mak common
 
 dist-hook:
 	cp gstreamer.spec $(distdir)
+	rm -rf `find $(distdir)/common -name CVS`
 
 rpm: dist
 	rpm -ta $(distdir).tar.gz