diff --git a/ompi/Makefile.am b/ompi/Makefile.am
index df0343200e..1a8da8dfe8 100644
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@@ -91,6 +91,7 @@ libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
+include_HEADERS =
 nobase_ompi_HEADERS = 
 dist_pkgdata_DATA =
 libmpi_la_SOURCES += $(headers)
@@ -113,9 +114,7 @@ include file/Makefile.am
 include group/Makefile.am
 include info/Makefile.am
 include op/Makefile.am
-if WANT_PERUSE
 include peruse/Makefile.am
-endif
 include proc/Makefile.am
 include request/Makefile.am
 include runtime/Makefile.am
diff --git a/ompi/mca/osc/Makefile.am b/ompi/mca/osc/Makefile.am
index db310bebd2..4081c4f622 100644
--- a/ompi/mca/osc/Makefile.am
+++ b/ompi/mca/osc/Makefile.am
@@ -20,17 +20,16 @@
 noinst_LTLIBRARIES = libmca_osc.la
 libmca_osc_la_SOURCES =
 
-# header setup
-nobase_ompi_HEADERS = $(headers)
-ompidir = $(includedir)/openmpi/ompi/mca/osc
-
 # local files
 headers = osc.h
 libmca_osc_la_SOURCES += $(headers)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
-nobase_ompi_HEADERS += $(headers)
+nobase_ompi_HEADERS = $(headers)
+ompidir = $(includedir)/openmpi/ompi/mca/osc
+else
+ompidir = $(includedir)
 endif
 
 include base/Makefile.am
diff --git a/ompi/peruse/Makefile.am b/ompi/peruse/Makefile.am
index b470c79535..8cc29d03b4 100644
--- a/ompi/peruse/Makefile.am
+++ b/ompi/peruse/Makefile.am
@@ -14,10 +14,13 @@
 
 # This makefile.am does not stand on its own - it is included from ompi/Makefile.am
 
-headers += peruse/peruse_internal.h \
-        peruse/peruse.h
+headers += peruse/peruse-internal.h
+
+if WANT_PERUSE
+# do NOT want this nobase - we want the peruse stripped off...
+include_HEADERS += peruse/peruse.h
 
 libmpi_la_SOURCES += \
         peruse/peruse.c \
 	peruse/peruse_module.c
-
+endif