diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4
index 55c52dc7b0..ab8129b684 100644
--- a/config/ompi_configure_options.m4
+++ b/config/ompi_configure_options.m4
@@ -345,20 +345,25 @@ mpi_param_check=ompi_mpi_param_check
 if test "$with_mpi_param_check" = "no" -o \
     "$with_mpi_param_check" = "never"; then
     mpi_param_check=0
+    mpi_param_check_level=0
     AC_MSG_RESULT([never])
 elif test "$with_mpi_param_check" = "yes" -o \
     "$with_mpi_param_check" = "always"; then
     mpi_param_check=1
+    mpi_param_check_level=1
     AC_MSG_RESULT([always])
 elif test "$with_mpi_param_check" = "runtime" -o \
     -z "$with_mpi_params_check"; then
     AC_MSG_RESULT([runtime])
+    mpi_param_check_level=2
 else
     AC_MSG_RESULT([unknown])
     AC_MSG_WARN([*** Unrecognized --with-mpi-param-check value])
     AC_MSG_WARN([*** See "configure --help" output])
     AC_MSG_WARN([*** Defaulting to "runtime"])
 fi
+AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK_LEVEL, $mpi_param_check_level,
+    [Whether we want to check MPI parameters never (0), always (1), or decide at run-time (2) -- this macro mainly for displaying the right value in ompi_info])
 AC_DEFINE_UNQUOTED(MPI_PARAM_CHECK, $mpi_param_check,
     [Whether we want to check MPI parameters always, never, or decide at run-time])
 
diff --git a/ompi/tools/ompi_info/param.cc b/ompi/tools/ompi_info/param.cc
index 2db2db3b2a..3f5214eb71 100644
--- a/ompi/tools/ompi_info/param.cc
+++ b/ompi/tools/ompi_info/param.cc
@@ -501,9 +501,8 @@ void ompi_info::do_config(bool want_all)
   const string f90profiling((OMPI_ENABLE_MPI_PROFILING && OMPI_WANT_F90_BINDINGS) ?
                             "yes" : "no");
   const string cxxexceptions(OMPI_HAVE_CXX_EXCEPTION_SUPPORT ? "yes" : "no");
-  int ompi_mpi_param_check = 3;
-  const string paramcheck(0 == MPI_PARAM_CHECK ? "never" :
-                          1 == MPI_PARAM_CHECK ? "always" : "runtime");
+  const string paramcheck(0 == MPI_PARAM_CHECK_LEVEL ? "never" :
+                          1 == MPI_PARAM_CHECK_LEVEL ? "always" : "runtime");
   string threads;
   const string want_libltdl(OMPI_WANT_LIBLTDL ? "yes" : "no");
   const string mpirun_prefix_by_default(ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT ?