diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4
index 1ebf01f0dc4..f422e679a17 100644
--- a/config/ompi_configure_options.m4
+++ b/config/ompi_configure_options.m4
@@ -169,9 +169,9 @@ esac
 AC_MSG_CHECKING([where to install Fortran MPI modules])
 AC_ARG_WITH([mpi-moduledir],
     [AS_HELP_STRING([--with-mpi-moduledir],
-                    [specify where to install Fortran MPI modules (default: $libdir)])],
+                    [specify where to install Fortran MPI modules (default: $includedir)])],
     [OMPI_FORTRAN_MODULEDIR=$withval],
-    [OMPI_FORTRAN_MODULEDIR=$libdir])
+    [OMPI_FORTRAN_MODULEDIR=$includedir])
 AC_SUBST(OMPI_FORTRAN_MODULEDIR)
 AC_MSG_RESULT([$OMPI_FORTRAN_MODULEDIR])
 
diff --git a/docs/installing-open-mpi/configure-cli-options/mpi.rst b/docs/installing-open-mpi/configure-cli-options/mpi.rst
index 6205175443d..0903964ebad 100644
--- a/docs/installing-open-mpi/configure-cli-options/mpi.rst
+++ b/docs/installing-open-mpi/configure-cli-options/mpi.rst
@@ -63,7 +63,10 @@ MPI API behaviors that can be used with ``configure``:
 * ``--with-mpi-moduledir=DIR``:
   Specify a specific ``DIR`` directory where to install the MPI
   Fortran bindings modulefiles.  By default, Open MPI will install
-  Fortran modulefiles into ``$libdir``.
+  Fortran modulefiles into ``$includedir``.
+
+  .. note:: Previous versions of Open MPI installed Fortran
+            modulefiles into ``$libdir``.
 
 * ``--enable-mpi-ext[=LIST]``:
   Enable Open MPI's non-portable API extensions.  ``LIST`` is a