diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4
index 3a746dc2aa..37b7542ae3 100644
--- a/config/ompi_configure_options.m4
+++ b/config/ompi_configure_options.m4
@@ -61,13 +61,13 @@ AC_DEFINE_UNQUOTED(OMPI_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
 AC_MSG_CHECKING([if want developer-level compiler pickyness])
 AC_ARG_ENABLE(picky, 
     AC_HELP_STRING([--enable-picky],
-                   [enable developer-level compiler pickyness (not for general MPI users!) (default: enabled)]))
+                   [enable developer-level compiler pickyness when building Open MPI (default: disabled)]))
 if test "$enable_picky" = "yes"; then
-    AC_MSG_RESULT([no])
-    WANT_PICKY_COMPILER=0
-else
     AC_MSG_RESULT([yes])
     WANT_PICKY_COMPILER=1
+else
+    AC_MSG_RESULT([no])
+    WANT_PICKY_COMPILER=0
 fi
 #################### Early development override ####################
 if test "$WANT_PICKY_COMPILER" = "0" -a -z "$enable_picky" -a -d .svn; then
@@ -227,12 +227,12 @@ AC_MSG_CHECKING([if want to install OMPI header files])
 AC_ARG_WITH(devel-headers,
     AC_HELP_STRING([--with-devel-headers],
                    [normal MPI users/applications do not need this (mpi.h and mpif.h are ALWAYS installed).  Developer headers are only necessary for MCA module authors (default: disabled).]))
-if test "$with_devel_headers" != "yes"; then
-    AC_MSG_RESULT([no])
-    WANT_INSTALL_HEADERS=0
-else
+if test "$with_devel_headers" = "yes"; then
     AC_MSG_RESULT([yes])
     WANT_INSTALL_HEADERS=1
+else
+    AC_MSG_RESULT([no])
+    WANT_INSTALL_HEADERS=0
 fi
 AM_CONDITIONAL(WANT_INSTALL_HEADERS, test "$WANT_INSTALL_HEADERS" = 1)
 
diff --git a/config/ompi_setup_cc.m4 b/config/ompi_setup_cc.m4
index 539dcd6db2..a906f870a6 100644
--- a/config/ompi_setup_cc.m4
+++ b/config/ompi_setup_cc.m4
@@ -53,7 +53,7 @@ if test "$GCC" = "yes" -a "$WANT_PICKY_COMPILER" = 1; then
 
     CFLAGS="$CFLAGS $add"
     OMPI_UNIQ(CFLAGS)
-    AC_MSG_WARN([$add has been added to CFLAGS (developer copy)])
+    AC_MSG_WARN([$add has been added to CFLAGS (--enable-picky)])
     unset add
 fi
 
diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4
index 1422d989c5..d2218f3c17 100644
--- a/config/ompi_setup_cxx.m4
+++ b/config/ompi_setup_cxx.m4
@@ -40,7 +40,7 @@ if test "$GCC" = "yes" -a "$WANT_PICKY_COMPILER" = 1; then
 
     CXXFLAGS="$CXXFLAGS $add"
     OMPI_UNIQ(CXXFLAGS)
-    AC_MSG_WARN([$add has been added to CXXFLAGS (developer copy)])
+    AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
     unset add
 fi