diff --git a/Makefile.am b/Makefile.am
index 7160cfd7f7..392b3fd29f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = macros debian intl doc-tools doc lib src intl-scm po rpm accounts
+SUBDIRS = intl  m4  macros debian doc-tools doc lib src intl-scm po rpm accounts
 
 docdir = ${GNC_DOC_INSTALL_DIR}
 
@@ -30,7 +30,7 @@ m4data_DATA = gnucash.m4
 # Don't list any directories or you'll get *everything*, including the
 # CVS dirs.
 
-EXTRA_DIST = \
+EXTRA_DIST = config.rpath  \
   .cvsignore \
   ChangeLog.1 \
   HACKING \
diff --git a/configure.in b/configure.in
index 73a22a0889..0ab85515a7 100644
--- a/configure.in
+++ b/configure.in
@@ -805,7 +805,7 @@ chmod u+x src/bin/overrides/gnucash-make-guids
 ### --------------------------------------------------------------------------
 ### Makefile creation
 
-AC_OUTPUT(
+AC_OUTPUT( m4/Makefile  intl/Makefile 
           dnl # Makefiles
           Makefile
           accounts/Makefile
@@ -829,7 +829,6 @@ AC_OUTPUT(
           doc/sgml/es/Makefile
           doc/sgml/pt_PT/Makefile
           doc-tools/Makefile
-          intl/Makefile
           intl-scm/Makefile
           lib/Makefile
           lib/guile-www/Makefile