diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55a783a3886827e8b5a156cb7fc8c63f02f0e311..059cebceebf032ba903c17bd70cdb2c77a17296c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -645,6 +645,10 @@ if( CHAMELEON_SCHED_STARPU )
         if ( HAVE_STARPU_MPI_INIT_CONF )
             message("-- ${Blue}Add definition HAVE_STARPU_MPI_INIT_CONF${ColourReset}")
         endif()
+        check_function_exists(starpu_mpi_wait_for_all HAVE_STARPU_MPI_WAIT_FOR_ALL)
+        if ( HAVE_STARPU_MPI_WAIT_FOR_ALL )
+            message("-- ${Blue}Add definition HAVE_STARPU_MPI_WAIT_FOR_ALL${ColourReset}")
+        endif()
         check_function_exists(starpu_mpi_data_migrate HAVE_STARPU_MPI_DATA_MIGRATE)
         if ( HAVE_STARPU_MPI_DATA_MIGRATE )
             message("-- ${Blue}Add definition HAVE_STARPU_MPI_DATA_MIGRATE${ColourReset}")
diff --git a/runtime/starpu/control/runtime_async.c b/runtime/starpu/control/runtime_async.c
index 3241acc15ca6e0c49d304b014ba2500286da5c05..f210d0f1b077880bce6072ef9084d71ac7f93755 100644
--- a/runtime/starpu/control/runtime_async.c
+++ b/runtime/starpu/control/runtime_async.c
@@ -55,9 +55,15 @@ int RUNTIME_sequence_wait( CHAM_context_t  *chamctxt,
         RUNTIME_progress(chamctxt);
     }
 
-    starpu_task_wait_for_all();
 #if defined(CHAMELEON_USE_MPI)
+#  if defined(HAVE_STARPU_MPI_WAIT_FOR_ALL)
+    starpu_mpi_wait_for_all(MPI_COMM_WORLD);
+#  else
+    starpu_task_wait_for_all();
     starpu_mpi_barrier(MPI_COMM_WORLD);
+#  endif
+#else
+    starpu_task_wait_for_all();
 #endif
     return CHAMELEON_SUCCESS;
 }
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index 69fe75a64ee01b5eb98f87bde1c214b9a7e00dde..5854a403aa3fb1bcf41098c4bf268daf1075283f 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -198,9 +198,17 @@ void RUNTIME_resume( CHAM_context_t *chamctxt )
 void RUNTIME_barrier( CHAM_context_t *chamctxt )
 {
     (void)chamctxt;
-    starpu_task_wait_for_all();
+
 #if defined(CHAMELEON_USE_MPI)
+#  if defined(HAVE_STARPU_MPI_WAIT_FOR_ALL)
+    starpu_mpi_wait_for_all(MPI_COMM_WORLD);
+    starpu_mpi_barrier(MPI_COMM_WORLD);
+#  else
+    starpu_task_wait_for_all();
     starpu_mpi_barrier(MPI_COMM_WORLD);
+#  endif
+#else
+    starpu_task_wait_for_all();
 #endif
 }
 
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index 767c65f1342328dfa3bcd59071ce95bc22b1a166..1dec2fd4898764cb08a601e778de6651609d3a10 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -37,6 +37,7 @@
 #cmakedefine HAVE_STARPU_MPI_CACHED_RECEIVE
 #cmakedefine HAVE_STARPU_MPI_COMM_GET_ATTR
 #cmakedefine HAVE_STARPU_MPI_INIT_CONF
+#cmakedefine HAVE_STARPU_MPI_WAIT_FOR_ALL
 
 #if defined(CHAMELEON_USE_MPI)
 #include <starpu_mpi.h>