diff --git a/m4/ChangeLog b/m4/ChangeLog
index 00c7aa9..1e6d88f 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* Makefile.am (EXTRA_DIST): New - just has EXTRA_DIST.  (Using a
+	directory in EXTRA_DIST in the parent was causing 'make dist' to fail.)
+
 2004-08-19 Paul Jakma <paul@dishone.st>
 
 	* *.m4: import of libtool CVS m4 autoconf files. These only
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 0000000..a1df668
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1,2 @@
+EXTRA_DIST= ChangeLog Makefile.am README.txt \
+	argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.m4