diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 3ca612fb5b57fe9ae8524939cca36b9d30f85968..82fa74bec3ecb8371f8bf363eaa7e889a9e99fdf 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -2,6 +2,10 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+SCOTCH_VERSION=scotch_5.1.10b
+SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
+export SCOTCH_ARCH_PATH
+
 wmakeLnInclude decompositionMethods
 
 wmake libso scotchDecomp
@@ -9,7 +13,10 @@ wmake libso metisDecomp
 
 if [ -d "$FOAM_MPI_LIBBIN" ]
 then
-    ( WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso ptscotchDecomp )
+(
+    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
+    wmake libso ptscotchDecomp
+)
 fi
 
 wmake libso decompositionMethods
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 3841a348190dc6ea623a04d35d1eb7cbdce7d990..17e6ea5ced3c94e62916539cec9bf1906b7c9be5 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -3,7 +3,7 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
-    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1.10b/include \
+    -I$(SCOTCH_ARCH_PATH)/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index 287aad462b5cd51050bec419798a58700968f95b..c832cc0b7cdd119853edb938ff9bbf49d52d69d5 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(WM_THIRD_PARTY_DIR)/scotch_5.1.10b/include \
+    -I$(SCOTCH_ARCH_PATH)/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude