diff --git a/oshmem/include/Makefile.am b/oshmem/include/Makefile.am
index 75e5e01a5d..cd239f4031 100644
--- a/oshmem/include/Makefile.am
+++ b/oshmem/include/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2013      Mellanox Technologies, Inc.
+# Copyright (c) 2013-2015 Mellanox Technologies, Inc.
 #                         All rights reserved.
 # $COPYRIGHT$
 #
@@ -11,14 +11,10 @@
 headers = oshmem_config.h
 nodist_headers =
 
+if PROJECT_OSHMEM
 # Install these in $(includedir)
 include_HEADERS =
 
-# Install these in $(includedir)
-mppincludedir = $(includedir)/mpp
-mppinclude_HEADERS = mpp/shmem.h \
-                     mpp/shmem.fh
-
 # Always install these in $(pkgincludedir)
 pkginclude_HEADERS =
 
@@ -26,6 +22,9 @@ include_HEADERS += shmem.fh \
         shmemx.h \
         shmem-compat.h
 
+nobase_include_HEADERS = mpp/shmem.h \
+                         mpp/shmem.fh
+
 # These files are always installed in $(includedir), but shouldn't be
 # shipped since they are generated by configure from their .in
 # counterparts (which AM automatically ships).
@@ -36,8 +35,10 @@ include_HEADERS += pshmem.h \
         pshmemx.h
 endif
 
-nobase_dist_noinst_HEADERS = $(headers)
-nobase_nodist_noinst_HEADERS = $(nodist_headers)
+oshmemdir=${includedir}/openshmem
+nobase_dist_oshmem_HEADERS = $(headers)
+nobase_nodist_oshmem_HEADERS = $(nodist_headers)
+endif
 
 distclean-local:
 
diff --git a/oshmem/runtime/Makefile.am b/oshmem/runtime/Makefile.am
index dbeff26054..301b1e01ae 100644
--- a/oshmem/runtime/Makefile.am
+++ b/oshmem/runtime/Makefile.am
@@ -9,8 +9,9 @@
 
 # This makefile.am does not stand on its own - it is included from oshmem/Makefile.am
 
+if PROJECT_OSHMEM
 dist_oshmemdata_DATA += runtime/help-shmem-runtime.txt
-
+endif
 
 headers += \
 	runtime/runtime.h \
diff --git a/oshmem/shmem/Makefile.am b/oshmem/shmem/Makefile.am
index 14d9e4d9ff..bf21979064 100644
--- a/oshmem/shmem/Makefile.am
+++ b/oshmem/shmem/Makefile.am
@@ -12,4 +12,6 @@ EXTRA_DIST =
 headers += shmem/shmem_api_logger.h \
            shmem/shmem_lock.h
 
+if PROJECT_OSHMEM
 dist_oshmemdata_DATA += shmem/help-shmem-api.txt
+endif
diff --git a/oshmem/shmem/man/man3/Makefile.extra b/oshmem/shmem/man/man3/Makefile.extra
index 965bbbb97c..4710426f58 100644
--- a/oshmem/shmem/man/man3/Makefile.extra
+++ b/oshmem/shmem/man/man3/Makefile.extra
@@ -176,5 +176,7 @@ shmem_api_man_pages = \
         shmem/man/man3/shmem_clear_cache_inv.3 \
         shmem/man/man3/shmem_clear_cache_line_inv.3
 
+if PROJECT_OSHMEM
 nodist_man_MANS += $(shmem_api_man_pages)
 EXTRA_DIST += $(shmem_api_man_pages:.3=.3in)
+endif  # PROJECT_OSHMEM
diff --git a/oshmem/tools/wrappers/Makefile.am b/oshmem/tools/wrappers/Makefile.am
index 6399483afd..0f1da6a845 100644
--- a/oshmem/tools/wrappers/Makefile.am
+++ b/oshmem/tools/wrappers/Makefile.am
@@ -10,11 +10,11 @@
 #
 # $HEADER$
 
+if PROJECT_OSHMEM
 nodist_oshmemdata_DATA =  \
 	shmemcc-wrapper-data.txt \
 	shmemfort-wrapper-data.txt
 
-if PROJECT_OSHMEM
 # Only install / uninstall if we're building oshmem
 install-exec-hook:
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"