diff --git a/config/Makefile.am b/config/Makefile.am
index 21ec00249e..ff122f85fd 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST		= \
 			cxx_find_template_repository.m4 \
 			cxx_find_exception_flags.m4 \
 			cxx_have_exceptions.m4 \
+            lam_case_sensitive_fs_setup.m4 \
 			lam_check_optflags.m4 \
 			lam_configure_options.m4 \
 			lam_functions.m4 \
diff --git a/config/lam_case_sensitive_fs_setup.m4 b/config/lam_case_sensitive_fs_setup.m4
new file mode 100644
index 0000000000..7de2f17b26
--- /dev/null
+++ b/config/lam_case_sensitive_fs_setup.m4
@@ -0,0 +1,89 @@
+dnl -*- shell-script -*-
+dnl
+dnl $HEADER$
+dnl
+
+AC_DEFUN(LAM_CASE_SENSITIVE_FS_SETUP,[
+#
+# Arguments: none
+#
+# Dependencies: None
+#
+# See if we are on a case sensitive filesystem.  Some filesystems
+# (like HFS+ on MacOS X and MS Windows) are not case sensitive - mpicc
+# and mpiCC are the same file.
+#
+# Sets prefix_OS_HAVE_CASE_SENSITIVE_FS to 1 if filesystem is case
+# sensitive (ie, mpicc and mpiCC will be different files) or 0 if
+# filesystem is not case sensitive (ie, mpicc and mpiCC will be
+# the same file).
+#
+#
+
+have_cs_fs=1
+
+AC_MSG_CHECKING([if build filesystem is case sensitive])
+cat > conf_fs_test.$$ <<EOF
+lowercase
+EOF
+
+cat > CONF_FS_TEST.$$ <<EOF
+uppercase
+EOF
+
+if test "`cat conf_fs_test.$$`" = "lowercase"; then
+    have_cs_fs=1
+    AC_MSG_RESULT([yes])
+else
+    have_cs_fs=0
+    AC_MSG_RESULT([no])
+fi
+
+rm -f conf_fs_test.$$ CONF_FS_TEST.$$
+
+#
+# Now see what the user wants to do...
+#
+AC_MSG_CHECKING([if configuring for case sensitive fs])
+AC_ARG_WITH(cs_fs, [  --with-cs-fs            Destination FS is case sensitive
+                          (specify --without-cs-fs if installing on HFS+
+                           on MacOS X)])
+
+if test "$with_cs_fs" = "yes"; then
+    LAM_WANT_CS_FS=1
+elif test -z "$with_cs_fs"; then
+    LAM_WANT_CS_FS=$have_cs_fs
+else
+    LAM_WANT_CS_FS=0
+fi
+
+if test "$LAM_WANT_CS_FS" = "1"; then
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL(CASE_SENSITIVE_FS, test "$LAM_WANT_CS_FS" = "1")
+
+if test "$LAM_WANT_CS_FS" = "0"; then
+	cat <<EOF
+
+*******************************************************************************
+NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
+*******************************************************************************
+
+Because LAM/MPI is being installed on a non-case sensitive file system, the
+C++ wrapper compiler will be named mpic++ instead of the traditional mpiCC.
+
+Please update any makefiles appropriately.
+
+*******************************************************************************
+NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
+*******************************************************************************
+
+EOF
+	sleep 5
+fi
+
+# Clean up
+unset have_cs_fs])dnl
diff --git a/configure.ac b/configure.ac
index 6609f39719..33314b185f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,8 @@ LAM_SETUP_F90
 # System-specific tests
 ##################################
 
+lam_show_title "System-specific tests"
+
 # all: endian
 # all: SYSV semaphores
 # all: SYSV shared memory