diff --git a/configure.ac b/configure.ac
index e796d1c6fe..a8a1fc4aea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,7 +170,7 @@ AC_CONFIG_HEADERS([opal/include/opal_config.h])
 m4_ifdef([project_orte],
          [AC_CONFIG_HEADERS([orte/include/orte_config.h])])
 m4_ifdef([project_ompi],
-         [AC_CONFIG_HEADERS([ompi/include/ompi_config.h ompi/include/mpi.h])])
+         [AC_CONFIG_HEADERS([ompi/include/mpi.h])])
 m4_ifdef([project_oshmem],
          [AC_CONFIG_HEADER([oshmem/include/oshmem_config.h oshmem/include/shmem.h oshmem/include/pshmem.h])])
 
diff --git a/ompi/include/Makefile.am b/ompi/include/Makefile.am
index 70dbd1c6b5..e03d0874e4 100644
--- a/ompi/include/Makefile.am
+++ b/ompi/include/Makefile.am
@@ -22,8 +22,8 @@ include $(top_srcdir)/Makefile.ompi-rules
 
 # Note - headers and nodist_headers will go in ${includedir}/openmpi,
 # not ${includedir}/
-headers = 
-nodist_headers = ompi_config.h
+headers = ompi_config.h
+nodist_headers =
 
 # Install these in $(includedir)
 include_HEADERS = 
diff --git a/ompi/include/ompi_config.h.in b/ompi/include/ompi_config.h
similarity index 100%
rename from ompi/include/ompi_config.h.in
rename to ompi/include/ompi_config.h