diff --git a/etc/settings.csh b/etc/settings.csh
index d56468889..5e9457ae4 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -328,6 +328,18 @@ case MVAPICH2:
     unset mpi_version
     breaksw
 
+case SYSTEMMPICH:
+    set mpi_version=mpich-system
+    setenv MPI_HOME $CRAY_MPICH2_DIR
+    setenv MPI_ARCH_PATH $CRAY_MPICH2_DIR
+    setenv MPICH_ROOT $MPI_ARCH_PATH
+
+    _foamAddPath $MPI_ARCH_PATH/bin
+    _foamAddLib  $MPI_ARCH_PATH/lib
+
+    unset mpi_version
+    breaksw
+
 case MPICH:
     set mpi_version=mpich-1.2.4
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
diff --git a/etc/settings.sh b/etc/settings.sh
index 1327cee6f..6e5778fd7 100755
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -404,6 +404,18 @@ MVAPICH2)
     unset mpi_version
     ;;
 
+SYSTEMMPICH)
+    mpi_version=mpich-system
+    export MPI_HOME=$CRAY_MPICH2_DIR
+    export MPI_ARCH_PATH=$CRAY_MPICH2_DIR
+    export MPICH_ROOT=$MPI_ARCH_PATH
+
+    _foamAddPath $MPI_ARCH_PATH/bin
+    _foamAddLib  $MPI_ARCH_PATH/lib
+
+    unset mpi_version
+    ;;
+
 MPICH)
     mpi_version=mpich-1.2.4
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version