diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index 59185a9bf0582d051afe481dfa4b6de6e781be9d..633013b28911d36172b6acc64cb1492f8fb6068e 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -140,6 +140,10 @@ if ( STARPU_FOUND )
     if ( HAVE_STARPU_MPI_REDUX )
       message("-- ${Blue}Add definition HAVE_STARPU_MPI_REDUX${ColourReset}")
     endif()
+    check_function_exists(_starpu_mpi_redux_wrapup_data HAVE_STARPU_MPI_REDUX_WRAPUP)
+    if ( HAVE_STARPU_MPI_REDUX_WRAPUP )
+      message("-- ${Blue}Add definition HAVE_STARPU_MPI_REDUX_WRAPUP${ColourReset}")
+    endif()
     check_function_exists(starpu_mpi_data_cpy_priority HAVE_STARPU_MPI_DATA_CPY_PRIORITY)
     if ( HAVE_STARPU_MPI_DATA_CPY_PRIORITY )
       message("-- ${Blue}Add definition HAVE_STARPU_MPI_DATA_CPY_PRIORITY${ColourReset}")
diff --git a/runtime/starpu/control/runtime_descriptor_ipiv.c b/runtime/starpu/control/runtime_descriptor_ipiv.c
index 69eb5d75f275cf8f4f814103fd590d511aeb86ee..d3a3d82c583f5f77f3e068c2239491ac3c3a1f15 100644
--- a/runtime/starpu/control/runtime_descriptor_ipiv.c
+++ b/runtime/starpu/control/runtime_descriptor_ipiv.c
@@ -304,14 +304,14 @@ void RUNTIME_ipiv_reducek( const RUNTIME_option_t *options,
     starpu_data_handle_t nextpiv = RUNTIME_pivot_getaddr( ipiv, k, h   );
     starpu_data_handle_t prevpiv = RUNTIME_pivot_getaddr( ipiv, k, h-1 );
 
-    if ( h < ipiv->n ) {
 #if defined(HAVE_STARPU_MPI_REDUX) && defined(CHAMELEON_USE_MPI)
 #if !defined(HAVE_STARPU_MPI_REDUX_WRAPUP)
+    if ( h < ipiv->n ) {
         starpu_mpi_redux_data_prio_tree( MPI_COMM_WORLD, nextpiv,
                                          options->priority, 2 /* Binary tree */ );
+    }
 #endif
 #endif
-    }
 
     /* Invalidate the previous pivot structure for correct initialization in later reuse */
     if ( h > 0 ) {
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index 0af602f9d8a1dc2343949978cc2065b0b32af15b..fd6d0e4688bd4ce9e8ba80b1084a00c999e5cb56 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -51,6 +51,7 @@
 #cmakedefine HAVE_STARPU_MPI_INTERFACE_DATATYPE_NODE_REGISTER
 #cmakedefine HAVE_STARPU_MPI_INTERFACE_DATATYPE_REGISTER
 #cmakedefine HAVE_STARPU_MPI_REDUX
+#cmakedefine HAVE_STARPU_MPI_REDUX_WRAPUP
 #cmakedefine HAVE_STARPU_MPI_DATA_CPY_PRIORITY
 
 #if (!defined(HAVE_STARPU_MPI_INTERFACE_DATATYPE_NODE_REGISTER) && !defined(HAVE_STARPU_MPI_INTERFACE_DATATYPE_REGISTER)) && defined(CHAMELEON_USE_MPI_DATATYPES)