diff --git a/Makefile.am b/Makefile.am
index 46cabb2..6af673c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,14 @@
 	       isisd
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
-	vtysh/Makefile.am update-autotools doc/mpls
+	vtysh/Makefile.am update-autotools doc/mpls \
+	redhat/quagga.* redhat/*.init
 
 dist-hook:
 	mkdir $(distdir)/tools
 	cp -p $(srcdir)/tools/*.pl $(distdir)/tools
 	cp -p $(srcdir)/tools/*.el $(distdir)/tools
 	cp -p $(srcdir)/tools/*.cgi $(distdir)/tools
-	cp -p $(srcdir)/redhat/*.init $(distdir)/redhat
-	cp -p $(srcdir)/redhat/quagga.* $(distdir)/redhat
 	rm -rf `find $(distdir)/doc -type d -name CVS`
+	rm -rf `find $(distdir)/ -type f -name "*~"`
+