diff --git a/configure.ac b/configure.ac
index a8a1fc4aea..f93c6ff965 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,7 +172,7 @@ m4_ifdef([project_orte],
 m4_ifdef([project_ompi],
          [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])])
+         [AC_CONFIG_HEADER([oshmem/include/shmem.h])])
 
 # override/fixup the version numbers set by AC_INIT, since on
 # developer builds, there's no good way to know what the version is
diff --git a/oshmem/include/Makefile.am b/oshmem/include/Makefile.am
index 4b3f506cf5..46d97eda7a 100644
--- a/oshmem/include/Makefile.am
+++ b/oshmem/include/Makefile.am
@@ -8,9 +8,8 @@
 #
 
 
-headers =
-nodist_headers = \
-	oshmem_config.h
+headers = oshmem_config.h
+nodist_headers =
 
 # Install these in $(includedir)
 include_HEADERS =
diff --git a/oshmem/include/oshmem_config.h.in b/oshmem/include/oshmem_config.h
similarity index 100%
rename from oshmem/include/oshmem_config.h.in
rename to oshmem/include/oshmem_config.h
diff --git a/oshmem/include/pshmem.h.in b/oshmem/include/pshmem.h
similarity index 100%
rename from oshmem/include/pshmem.h.in
rename to oshmem/include/pshmem.h
diff --git a/oshmem/include/shmem.h.in b/oshmem/include/shmem.h.in
index 5c677212c1..b2ec6be165 100644
--- a/oshmem/include/shmem.h.in
+++ b/oshmem/include/shmem.h.in
@@ -27,8 +27,9 @@
 /*
  * SHMEM version
  */
-#define SHMEM_VERSION 1
-#define SHMEM_SUBVERSION 5
+#undef OSHMEM_MAJOR_VERSION
+#undef OSHMEM_MINOR_VERSION
+#undef OSHMEM_RELEASE_VERSION
 
 
 #ifndef OSHMEM_DECLSPEC