diff --git a/ChangeLog b/ChangeLog
index 4db0bdd..68186fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
+	* Makefile.am: make m4 as subdir, rather the EXTRA_DISTing it
+
+	* configure.ac: add m4/Makefile to output list
+
+2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>
+	
 	* Makefile.am: Only put pkgsrc dir in SUBDIRS if we should install
 	  rc.d files.  (Note that pkgsrc is always in DIST_SUBDIRS.)
 
diff --git a/Makefile.am b/Makefile.am
index d620c99..dbc0807 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 ## Process this file with automake to produce Makefile.in.
 
 SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
-         @ISISD@ @VTYSH@ @OSPFCLIENT@ @pkgsrcdir@ redhat doc
+         @ISISD@ @VTYSH@ @OSPFCLIENT@ doc m4 @pkgsrcdir@ redhat
 
 DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
-	  isisd vtysh ospfclient doc pkgsrc redhat tests
+	  isisd vtysh ospfclient doc m4 pkgsrc redhat tests
 
 EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
 	vtysh/Makefile.am update-autotools \
 	tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
-	tools/zebra.el m4
+	tools/zebra.el
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index b44befa..a03724f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.62 2004/08/31 18:16:36 gdt Exp $
+## $Id: configure.ac,v 1.63 2004/08/31 18:44:42 gdt Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@@ -1134,6 +1134,7 @@
 	  ospf6d/Makefile isisd/Makefile vtysh/Makefile doc/Makefile 
 	  ospfclient/Makefile
 	  vtysh/extract.pl
+	  m4/Makefile
 	  pkgsrc/Makefile
 	  redhat/Makefile redhat/quagga.spec
 	  lib/version.h
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