diff --git a/Makefile.am b/Makefile.am
index 416ceaa24..cc199fa17 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 # This is the top level Makefile for Gramps
 # $Id$
 
-SUBDIRS = po src doc example help
+SUBDIRS = m4 po src doc example help
 
 EXTRA_DIST = \
 	config.rpath autogen.sh gramps.spec.in gramps.spec \
 	COPYING-DOCS FAQ COPYING \
 	intltool-extract.in intltool-merge.in intltool-update.in \
-	config.sub config.guess gnome-doc-utils.make m4
+	config.sub config.guess gnome-doc-utils.make
 
 bin_SCRIPTS = gramps
 
diff --git a/configure.in b/configure.in
index d47bc9db2..47c78ef3a 100644
--- a/configure.in
+++ b/configure.in
@@ -221,6 +221,7 @@ AC_SUBST(GPREFIX)
 
 AC_CONFIG_FILES([
 po/Makefile.in
+m4/Makefile
 Makefile
 gramps.spec
 gramps.sh