diff --git a/Allwmake b/Allwmake
index 06fc4ffb5c0952de8e7865714dfaf0721292af11..ef0cf20f917779ab7703e8b9e1af129c356224c8 100755
--- a/Allwmake
+++ b/Allwmake
@@ -145,6 +145,9 @@ then
     export CCS="${CC:-$WM_CC}"  # CCS (serial compiler)   default=$(CC)
     export CCP=$(whichMpicc)    # CCP (parallel compiler) default=mpicc
 
+    # Consistency for Intel-MPI and non-icc compilers
+    [ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
+
     make realclean 2>/dev/null  # Extra safety
     make -j $WM_NCOMPPROCS scotch \
      && make \
@@ -209,6 +212,9 @@ then
         export CCS="${CC:-$WM_CC}"  # CCS (serial compiler)   default=$(CC)
         export CCP=$(whichMpicc)    # CCP (parallel compiler) default=mpicc
 
+        # Consistency for Intel-MPI and non-icc compilers
+        [ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
+
         make realclean 2>/dev/null  # Extra safety
         make -j $WM_NCOMPPROCS ptscotch \
          && make \