diff --git a/configure b/configure
index 1c651c0f1c926512289ee2181b59a8ae5a57c94e..255b59aa93f3514ab800efa149c6df8cfed3adbe 100755
--- a/configure
+++ b/configure
@@ -28247,7 +28247,7 @@ else
       call mpi_waitall
       end
 _ACEOF
-   for ac_lib in '' mpi mpi_f90 mpi_f77 mpich; do
+   for ac_lib in '' mpi mpifort mpi_f90 mpi_f77 mpich; do
      if test -z "$ac_lib"; then :
   ac_res="none required"
         LIBS="$MPI_FC_LIB $acx_option_func_search_save_LIBS"
@@ -28279,7 +28279,7 @@ fi
       call mpi_waitall
       end
 _ACEOF
-   for ac_lib in '' mpi mpi_f90 mpi_f77 mpich; do
+   for ac_lib in '' mpi mpifort mpi_f90 mpi_f77 mpich; do
      if test -z "$ac_lib"; then :
   ac_res="none required"
         LIBS="$MPI_FC_LIB -lmpi_f77 -lmpi $acx_option_func_search_save_LIBS"
@@ -28311,7 +28311,7 @@ fi
       call mpi_waitall
       end
 _ACEOF
-   for ac_lib in '' mpi mpi_f90 mpi_f77 mpich; do
+   for ac_lib in '' mpi mpifort mpi_f90 mpi_f77 mpich; do
      if test -z "$ac_lib"; then :
   ac_res="none required"
         LIBS="$MPI_FC_LIB -lmpi $acx_option_func_search_save_LIBS"
diff --git a/configure.ac b/configure.ac
index b20816481758044b7431a22476cc8a488016636d..d5a43e30eba7b065927debad7e01e086009de3b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ AC_ARG_ENABLE([mpi],
        [ACX_FORTRAN_PACKAGE([MPI], [mpif.h],,,
           [AC_MSG_FAILURE([Required include mpif.h not found or not compilable.])
            enable_MPI=no],[mpi_waitall],
-          [mpi mpi_f90 mpi_f77 mpich],[[-lmpi_f77 -lmpi],[-lmpi]],,
+          [mpi mpifort mpi_f90 mpi_f77 mpich],[[-lmpi_f77 -lmpi],[-lmpi]],,
           [AC_MSG_FAILURE([Cannot link Fortran MPI programs.])
            enable_MPI=no],[])])],
     [enable_mpi=no])