diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 3ce2f8e0fc..7e8773526d 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,13 +1,21 @@
-# -*- makefile -*-
 #
 # $HEADER$
 #
 
 include $(top_srcdir)/config/Makefile.options
 
-include_HEADERS = \
+headers = \
         atomic.h \
         constants.h \
         ompi.h \
         totalview.h \
         types.h
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(includedir)/openmpi/include
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif