diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f4a6608f4..8883a331ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ option(optimize "Turn on all compiler optimization flags"        OFF)
 # MPI for distributed-memory parallelism
 #===============================================================================
 
-if($ENV{FC} MATCHES "mpi*")
+if($ENV{FC} MATCHES "mpi.*")
   find_package(MPI REQUIRED)
   add_definitions(-DMPI)
   include_directories(BEFORE "${MPI_Fortran_INCLUDE_PATH}")
diff --git a/src/output_interface.F90 b/src/output_interface.F90
index f7b342e506..3c04ba36d4 100644
--- a/src/output_interface.F90
+++ b/src/output_interface.F90
@@ -7,7 +7,8 @@ module output_interface
 
 #ifdef HDF5
   use hdf5_interface
-#elif MPI
+#endif
+#ifdef MPI
   use mpiio_interface
 #endif