diff --git a/doc/ChangeLog b/doc/ChangeLog
index 188bc4f..37304ad 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-30  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* Makefile.am (EXTRA_DIST): Add files in mpls explicitly, to avoid
+	copying CVS files, per the automake manual's recommendations.
+
 2004-05-27 Paul Jakma <paul@dishone.st>
 
 	* Correct RIP port, s/521/520/, reported by xantius@xantius.com
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 79fc122..1619453 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,7 +8,9 @@
 
 man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
 
-EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) 
+EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) \
+	mpls/ChangeLog.opaque.txt mpls/cli_summary.txt \
+	mpls/opaque_lsa.txt mpls/ospfd.conf
 
 draft-zebra-00.txt:
 	groff -T ascii -ms draft-zebra-00.ms > draft-zebra-00.txt