diff --git a/Makefile.am b/Makefile.am
index b9b4355..6d9d864 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,19 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @VTYSH@ @OSPFCLIENT@ doc
+SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
+         @VTYSH@ @OSPFCLIENT@ doc
+
+DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d vtysh \
+	       ospfclient doc
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
-	vtysh/Makefile.am update-autotools
+	vtysh/Makefile.am update-autotools doc/mpls
 
 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
-	mkdir $(distdir)/redhat
 	cp -p $(srcdir)/redhat/*.init $(distdir)/redhat
 	cp -p $(srcdir)/redhat/zebra.* $(distdir)/redhat
+	rm -rf `find $(distdir)/doc -type d -name CVS`