diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4
index 4d7e901f98..283fd16a4e 100644
--- a/config/ompi_setup_cxx.m4
+++ b/config/ompi_setup_cxx.m4
@@ -104,7 +104,7 @@ AC_DEFUN([OMPI_SETUP_CXX],[
     HAVE_CXX_EXCEPTIONS=0
     AC_ARG_ENABLE([cxx-exceptions], 
         [AC_HELP_STRING([--enable-cxx-exceptions],
-	                [enable support for C++ exceptions (default: enabled)])],
+	                [enable support for C++ exceptions (default: disabled)])],
         [ENABLE_CXX_EXCEPTIONS="$enableval"])
 
     AC_MSG_CHECKING([if want C++ exception handling])
diff --git a/config/ompi_setup_f77.m4 b/config/ompi_setup_f77.m4
index 0d9a57ce42..f0cf5b17f6 100644
--- a/config/ompi_setup_f77.m4
+++ b/config/ompi_setup_f77.m4
@@ -108,9 +108,9 @@ directory.
 EOF
      AC_MSG_ERROR([C and Fortran 77 compilers are not link compatible.  Can not continue.])])])
 
-# Test to see if the F90 compilers likes the C++ exceptions flags.  If
+# Test to see if the F77 compilers likes the C++ exceptions flags.  If
 # it doesn't, just abort.  We *could* handle this scenario (e.g.,
-# probe the F90 compiler for what flags would be necessary), but we're
+# probe the F77 compiler for what flags would be necessary), but we're
 # kinda assuming that no one will care.  If they do, they'll e-mail us.
 AC_MSG_CHECKING([to see if F77 compiler likes the C++ exception flags])
 if test $OMPI_WANT_F77_BINDINGS -eq 0; then