diff --git a/bsc/intel-mpi/mpicc.patch b/bsc/intel-mpi/mpicc.patch
index 953b4f7..c98dffb 100644
--- a/bsc/intel-mpi/mpicc.patch
+++ b/bsc/intel-mpi/mpicc.patch
@@ -5,7 +5,7 @@
      case "${compiler_short_name}" in
      icc)    $dir/mpiicc -cc=$compiler_name "$@" ;;
 -    cc|*gcc*) $dir/mpigcc -cc=$compiler_name "$@" ;;
-+    cc|*gcc*|mcc|clang) $dir/mpigcc -cc=$compiler_name "$@" ;;
++    cc|*gcc*|mcc|clang|echo) $dir/mpigcc -cc=$compiler_name "$@" ;;
      mpicc)  $dir/mpigcc "$@" ;;    
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
@@ -14,7 +14,7 @@
      case "${compiler_short_name}" in
      icc)    $dir/mpiicc -cc=$compiler_name "$@" $opt_args ;;
 -    cc|*gcc*) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;;
-+    cc|*gcc*|mcc|clang) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;;
++    cc|*gcc*|mcc|clang|echo) $dir/mpigcc -cc=$compiler_name "$@" $opt_args ;;
      mpicc)  $dir/mpigcc "$@" $opt_args ;;    
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
diff --git a/bsc/intel-mpi/mpicxx.patch b/bsc/intel-mpi/mpicxx.patch
index a386007..16602f8 100644
--- a/bsc/intel-mpi/mpicxx.patch
+++ b/bsc/intel-mpi/mpicxx.patch
@@ -7,9 +7,9 @@
 -    icc|icpc)   $dir/mpiicpc -cxx=$compiler_name "$@" ;;
 -    *g++*)        $dir/mpigxx -cxx=$compiler_name "$@" ;;
 -    mpicxx)     $dir/mpigxx "$@" ;;
-+    icc|icpc)             $dir/mpiicpc -cxx=$compiler_name "$@" ;;
-+    *g++*|clang*++|mcxx)  $dir/mpigxx -cxx=$compiler_name "$@" ;;
-+    mpicxx)               $dir/mpigxx "$@" ;;
++    icc|icpc)                  $dir/mpiicpc -cxx=$compiler_name "$@" ;;
++    *g++*|clang*++|mcxx|echo)  $dir/mpigxx -cxx=$compiler_name "$@" ;;
++    mpicxx)                    $dir/mpigxx "$@" ;;
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
              echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables."; 
@@ -20,9 +20,9 @@
 -    icc|icpc)   $dir/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
 -    *g++*)        $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
 -    mpicxx)     $dir/mpigxx "$@" $opt_args ;;
-+    icc|icpc)             $dir/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
-+    *g++*|clang*++|mcxx)  $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
-+    mpicxx)               $dir/mpigxx "$@" $opt_args ;;
++    icc|icpc)                  $dir/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
++    *g++*|clang*++|mcxx|echo)  $dir/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
++    mpicxx)                    $dir/mpigxx "$@" $opt_args ;;
      *)  
              echo "Error: unsupported compiler name '$compiler_name'."
              echo "Check -cxx=<compiler_name> command line option and I_MPI_CXX='$I_MPI_CXX' and MPICH_CXX='$MPICH_CXX' variables.";