diff --git a/configure b/configure
index 6c076530bf74ff49dcefaa944190b44f819ca135..0b8a769ba3d2c1231ed029a4a84b7cb710983f17 100755
--- a/configure
+++ b/configure
@@ -28259,7 +28259,7 @@ else
       call mpi_waitall
       end
 _ACEOF
-   for ac_lib in '' mpi mpifort mpi_f90 mpi_f77 mpich; do
+   for ac_lib in '' mpi 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"
@@ -28291,7 +28291,7 @@ fi
       call mpi_waitall
       end
 _ACEOF
-   for ac_lib in '' mpi mpifort mpi_f90 mpi_f77 mpich; do
+   for ac_lib in '' mpi 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"
@@ -28323,7 +28323,7 @@ fi
       call mpi_waitall
       end
 _ACEOF
-   for ac_lib in '' mpi mpifort mpi_f90 mpi_f77 mpich; do
+   for ac_lib in '' mpi 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 d5a43e30eba7b065927debad7e01e086009de3b8..b20816481758044b7431a22476cc8a488016636d 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 mpifort mpi_f90 mpi_f77 mpich],[[-lmpi_f77 -lmpi],[-lmpi]],,
+          [mpi mpi_f90 mpi_f77 mpich],[[-lmpi_f77 -lmpi],[-lmpi]],,
           [AC_MSG_FAILURE([Cannot link Fortran MPI programs.])
            enable_MPI=no],[])])],
     [enable_mpi=no])