diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options
index 74b6659671..bac4540572 100644
--- a/src/Pstream/mpi/Make/options
+++ b/src/Pstream/mpi/Make/options
@@ -1,5 +1,4 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType
 
 EXE_INC  = $(PFLAGS) $(PINC)
 LIB_LIBS = $(PLIBS)
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 8f769c3882..ea8550c8c3 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -40,7 +40,7 @@ if [ -n "$SCOTCH_ARCH_PATH" ]
 then
     wmake $targetType scotchDecomp
 
-    if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
+    if [ -n "$WM_MPLIB" ] && [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
     then
         wmakeMpiLib ptscotchDecomp
     fi
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 5e3069ba8b..2af0fddac9 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -1,5 +1,4 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index d2cc770692..df47c9071c 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -2,8 +2,7 @@
  * Note including of mplib compilation rules.
  * This is purely to avoid scotch.h including mpicxx.h, which causes problems.
  */
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options
index 45a153b373..3b02b8dd9a 100644
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@@ -1,5 +1,4 @@
-sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
-sinclude $(RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplibType
 
 EXE_INC = \
     /* -DFULLDEBUG -g -O0 */ \
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index 8cee0bce32..6525d5bf68 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -9,7 +9,7 @@ LD         = ld
 GFLAGS     = -D$(WM_ARCH) -DWM_ARCH_OPTION=$(WM_ARCH_OPTION) \
              -DWM_$(WM_PRECISION_OPTION) -DWM_LABEL_SIZE=$(WM_LABEL_SIZE)
 GINC       =
-GLIBS      = -lm
+GLIBS      = -lm -lpthread
 GLIB_LIBS  =
 
 
diff --git a/wmake/rules/General/mplibHPMPI b/wmake/rules/General/mplibHPMPI64
similarity index 100%
rename from wmake/rules/General/mplibHPMPI
rename to wmake/rules/General/mplibHPMPI64
diff --git a/wmake/rules/General/mplibINTELMPI b/wmake/rules/General/mplibINTELMPI64
similarity index 100%
rename from wmake/rules/General/mplibINTELMPI
rename to wmake/rules/General/mplibINTELMPI64
diff --git a/wmake/rules/solarisGcc/mplibMPI b/wmake/rules/General/mplibMPI
similarity index 100%
rename from wmake/rules/solarisGcc/mplibMPI
rename to wmake/rules/General/mplibMPI
diff --git a/wmake/rules/General/mplibType b/wmake/rules/General/mplibType
new file mode 100644
index 0000000000..b4b0b3328b
--- /dev/null
+++ b/wmake/rules/General/mplibType
@@ -0,0 +1,3 @@
+-include $(GENERAL_RULES)/mplib$(WM_MPLIB)
+-include $(GENERAL_RULES)/mplib$(WM_MPLIB)$(WM_ARCH_OPTION)
+-include $(RULES)/mplib$(WM_MPLIB)
diff --git a/wmake/rules/linuxARM7Gcc/mplibHPMPI b/wmake/rules/linuxARM7Gcc/mplibHPMPI
deleted file mode 100644
index c44b3dd3f9..0000000000
--- a/wmake/rules/linuxARM7Gcc/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/linuxClang/mplibHPMPI b/wmake/rules/linuxClang/mplibHPMPI
deleted file mode 100644
index c44b3dd3f9..0000000000
--- a/wmake/rules/linuxClang/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/linuxGcc/mplibHPMPI b/wmake/rules/linuxGcc/mplibHPMPI
deleted file mode 100644
index c44b3dd3f9..0000000000
--- a/wmake/rules/linuxGcc/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/linuxIcc/mplibHPMPI b/wmake/rules/linuxIcc/mplibHPMPI
deleted file mode 100644
index c44b3dd3f9..0000000000
--- a/wmake/rules/linuxIcc/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH
deleted file mode 100644
index 767acf1ecc..0000000000
--- a/wmake/rules/solarisGcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio