diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27a355f8bd4c31b333e3471510abe8328c724179..7ad68e4242a8014cccea65e34e9168dd0dae6fd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -540,7 +540,7 @@ else (NOT CHAMELEON_SIMULATION)
             list(APPEND MPI_CXX_INCLUDE_PATH "${SIMGRID_INCLUDE_DIRS}/smpi")
         endif()
         if(NOT MPI_Fortran_COMPILER)
-            set(MPI_Fortran_COMPILER "${SIMGRID_DIR_FOUND}/bin/smpicxx")
+            set(MPI_Fortran_COMPILER "${SIMGRID_DIR_FOUND}/bin/smpif90")
         endif()
         if(NOT MPI_Fortran_LIBRARIES)
             set(MPI_Fortran_LIBRARIES "${SIMGRID_LIBRARIES}")
diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index 5c4f3c236596d2f460f6299fd20729b0a1631507..bf907e276be1b3393e03bf63f962b5c03c283a80 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit 5c4f3c236596d2f460f6299fd20729b0a1631507
+Subproject commit bf907e276be1b3393e03bf63f962b5c03c283a80