diff --git a/config/ompi_install_dirs.m4 b/config/ompi_install_dirs.m4
index 6f8ea9d5f6..140fa53f46 100644
--- a/config/ompi_install_dirs.m4
+++ b/config/ompi_install_dirs.m4
@@ -63,19 +63,5 @@ AC_DEFUN([OMPI_INSTALL_DIRS], [
 
     exec_prefix="$ompi_exec_prefix_save"
 
-    AC_CONFIG_FILES([$1.tmp:$1.in])
-    AC_CONFIG_COMMANDS([install-dirs], [
-        if test -f "$1" ; then
-            diff "$1" "$1.tmp" > /dev/null 2>&1
-            if test "$?" != "0" ; then
-               cp "$1.tmp" "$1"
-               echo "config.status: regenerating $1"
-            else
-               echo "config.status: $1 unchanged"
-            fi
-        else
-            cp "$1.tmp" "$1"
-            echo "config.status: creating $1"
-        fi
-        rm "$1.tmp"])
+    AC_CONFIG_FILES([$1])
 ])dnl
diff --git a/config/ompi_save_version.m4 b/config/ompi_save_version.m4
index fbe73a2cc5..ae97175c45 100644
--- a/config/ompi_save_version.m4
+++ b/config/ompi_save_version.m4
@@ -50,19 +50,5 @@ AC_DEFUN([OMPI_SAVE_VERSION], [
     AC_DEFINE_UNQUOTED($1[_VERSION], ["$]$1[_RELEASE_VERSION"],
         [Complete release number of ]$2)
 
-    AC_CONFIG_FILES([$4.tmp:$4.in])
-    AC_CONFIG_COMMANDS([$1-versions], [
-        if test -f "$4" ; then
-            diff "$4" "$4.tmp" > /dev/null 2>&1
-            if test "$?" != "0" ; then
-               cp "$4.tmp" "$4"
-               echo "config.status: regenerating $4"
-            else
-               echo "config.status: $4 unchanged"
-            fi
-        else
-            cp "$4.tmp" "$4"
-            echo "config.status: creating $4"
-        fi
-        rm "$4.tmp"])
+    AC_CONFIG_FILES([$4])
 ])dnl
diff --git a/ompi/include/Makefile.am b/ompi/include/Makefile.am
index 906d378ca4..5b28b6dcd4 100644
--- a/ompi/include/Makefile.am
+++ b/ompi/include/Makefile.am
@@ -16,9 +16,9 @@
 # $HEADER$
 #
 
-headers = ompi_config.h
-
-nodist_headers =
+headers =
+nodist_headers = \
+	ompi_config.h
 
 # these two are always installed in $(includedir), but shouldn't be
 # shipped since they are generated by configure from their .in
@@ -33,6 +33,8 @@ nobase_dist_ompi_HEADERS = $(headers)
 nobase_nodist_ompi_HEADERS = $(nodist_headers)
 else
 ompidir = $(includedir)
+nobase_dist_noinst_HEADERS = $(headers)
+nobase_nodist_noinst_HEADERS = $(nodist_headers)
 endif
 
 include ompi/Makefile.am
diff --git a/opal/include/Makefile.am b/opal/include/Makefile.am
index 26bed6a840..be43d739b8 100644
--- a/opal/include/Makefile.am
+++ b/opal/include/Makefile.am
@@ -16,28 +16,20 @@
 # $HEADER$
 #
 
-
-dist_noinst_HEADERS = \
+headers = \
 	opal_config_bottom.h \
 	opal_stdint.h
-
-nodist_noinst_HEADERS = \
+nodist_headers = \
 	opal_config.h
 
-headers = 
-nodist_headers =
-
 if WANT_INSTALL_HEADERS 
 opaldir = $(includedir)/openmpi
-
-nobase_dist_opal_HEADERS = \
-	$(headers) \
-	$(dist_noinst_HEADERS)
-nobase_nodist_opal_HEADERS = \
-	$(nodist_headers) \
-	$(nodist_noinst_HEADERS)
+nobase_dist_opal_HEADERS = $(headers)
+nobase_nodist_opal_HEADERS = $(nodist_headers)
 else
 opaldir = $(includedir)
+nobase_dist_noinst_HEADERS = $(headers)
+nobase_nodist_noinst_HEADERS = $(nodist_headers)
 endif
 
 include opal/Makefile.am
diff --git a/opal/include/opal/Makefile.am b/opal/include/opal/Makefile.am
index d84b51f365..5d527925b9 100644
--- a/opal/include/opal/Makefile.am
+++ b/opal/include/opal/Makefile.am
@@ -27,3 +27,9 @@ nodist_headers += \
 	opal/version.h
 
 include opal/sys/Makefile.am
+
+opal/install_dirs.h: $(top_builddir)/config.status $(srcdir)/opal/install_dirs.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+opal/version.h: $(top_builddir)/config.status $(srcdir)/opal/version.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
diff --git a/orte/include/Makefile.am b/orte/include/Makefile.am
index a768a9fc4e..d73d263e1a 100644
--- a/orte/include/Makefile.am
+++ b/orte/include/Makefile.am
@@ -17,9 +17,9 @@
 # $HEADER$
 #
 
-headers = orte_config.h
-
-nodist_headers = 
+headers =
+nodist_headers = \
+	orte_config.h
 
 if WANT_INSTALL_HEADERS 
 ortedir = $(includedir)/openmpi
@@ -27,6 +27,8 @@ nobase_dist_orte_HEADERS = $(headers)
 nobase_nodist_orte_HEADERS = $(nodist_headers)
 else
 ortedir = $(includedir)
+nobase_dist_noinst_HEADERS = $(headers)
+nobase_nodist_noinst_HEADERS = $(nodist_headers)
 endif
 
 include orte/Makefile.am