diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index b039588486..c56bbab3f9 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -117,8 +117,8 @@ case SYSTEMMPI:
 
 case MPICH:
     setenv FOAM_MPI mpich2-1.1.1p1
-    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$FOAM_MPI
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+    setenv MPI_HOME $MPI_ARCH_PATH
 
     _foamAddPath    $MPI_ARCH_PATH/bin
 
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 9e64803838..757aef05ee 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -125,8 +125,8 @@ SYSTEMMPI)
 
 MPICH)
     export FOAM_MPI=mpich2-1.1.1p1
-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
+    export MPI_HOME=$MPI_ARCH_PATH
 
     _foamAddPath    $MPI_ARCH_PATH/bin