diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 84ba7742bdb24caa2f1544e585dd60fc570fd3cb..12b2bd1182a1858cb31db71c87053949b7ad6c98 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -108,8 +108,8 @@ case Linux:
 case Darwin:    # Presumably x86_64
     if (! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64  # Default to 64-bit
     setenv WM_ARCH darwin64
-    setenv WM_CFLAGS "$WM_CFLAGS -m64 -Ddarwin"
-    setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64 -Ddarwin"
+    setenv WM_CFLAGS "$WM_CFLAGS -m64"
+    setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64"
     /bin/cat << INCOMPLETE
 ===============================================================================
 Darwin support (clang only) is incomplete or untested in this OpenFOAM release.
@@ -118,13 +118,9 @@ For further assistance, please contact www.OpenFOAM.com
 INCOMPLETE
     breaksw
 
-case SunOS:
-    setenv WM_ARCH SunOS64
-    setenv WM_MPLIB FJMPI
+case SunOS*:
+    setenv WM_ARCH solaris64
     setenv WM_COMPILER_LIB_ARCH 64
-    setenv WM_CFLAGS "$WM_CFLAGS -mabi=64"
-    setenv WM_CXXFLAGS "$WM_CXXFLAGS -mabi=64"
-    setenv WM_LDFLAGS "-mabi=64 -G0"
     breaksw
 
 default:
diff --git a/etc/config.sh/example/compiler b/etc/config.sh/example/compiler
index 27ec7cf152886a0a08686f7e9348686d62473e9e..f01252267b44478cf3e19b151160544acbd8308f 100644
--- a/etc/config.sh/example/compiler
+++ b/etc/config.sh/example/compiler
@@ -34,8 +34,8 @@ Gcc70)
 Gcc48u)
     # Example of using the system GCC 4.8 in Ubuntu 15.10. Keep in mind you
     # will also need to create the respective directory in "wmake/rules"
-    export WM_CC='gcc-4.8'
-    export WM_CXX='g++-4.8'
+    export CC='gcc-4.8'
+    export CXX='g++-4.8'
     ;;
 esac
 
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index bc3b2608ed594b23c46f300f1088ae2a1724bb6e..af61276c83b545aefe90c0ef70850857a5abdca9 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -102,8 +102,8 @@ Linux)
 Darwin)     # Presumably x86_64
     : ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION  # Default to 64-bit
     WM_ARCH=darwin64
-    export WM_CFLAGS="$WM_CFLAGS -m64 -Ddarwin"
-    export WM_CXXFLAGS="$WM_CXXFLAGS -m64 -Ddarwin"
+    export WM_CFLAGS="$WM_CFLAGS -m64"
+    export WM_CXXFLAGS="$WM_CXXFLAGS -m64"
     /bin/cat << INCOMPLETE 1>&2
 ===============================================================================
 Darwin support (clang only) is incomplete or untested in this OpenFOAM release.
@@ -112,13 +112,9 @@ For further assistance, please contact www.OpenFOAM.com
 INCOMPLETE
     ;;
 
-SunOS)
-    WM_ARCH=SunOS64
-    WM_MPLIB=FJMPI
+SunOS*)
+    WM_ARCH=solaris64
     export WM_COMPILER_LIB_ARCH=64
-    export WM_CFLAGS="$WM_CFLAGS -mabi=64"
-    export WM_CXXFLAGS="$WM_CXXFLAGS -mabi=64"
-    export WM_LDFLAGS="-mabi=64 -G0"
     ;;
 
 *)  # An unsupported operating system
diff --git a/wmake/rules/solarisGcc/X b/wmake/rules/solarisGcc/X
deleted file mode 100644
index 2e585bf7eb3282ecab4d6a7a70ebce0821d59c62..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/openwin/include/X11
-XLIBS      = -L/usr/openwin/lib -lXext -lX11
diff --git a/wmake/rules/solarisGcc/c b/wmake/rules/solarisGcc/c
deleted file mode 100644
index 77c03e62f8e89a7e1a5c1069bf8686afdad097fa..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/c
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(GENERAL_RULES)/Gcc/c
-
-cc          = gcc
-
-include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
deleted file mode 100644
index 68329d01a37419d4803745d50211aa498360dd8d..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/c++
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(GENERAL_RULES)/Gcc/c++
-
-CC          = g++ -std=c++11
-
-include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed
diff --git a/wmake/rules/solarisGcc/c++Debug b/wmake/rules/solarisGcc/c++Debug
deleted file mode 100644
index d57723865ac2c165030abc8015166600585e7c5b..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline -finline-functions
diff --git a/wmake/rules/solarisGcc/c++Opt b/wmake/rules/solarisGcc/c++Opt
deleted file mode 100644
index b277f8191d454b747af6f1bc9c7b5965f429138f..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/c++Opt
+++ /dev/null
@@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3 -fno-schedule-insns
-
-ROUNDING_MATH = -frounding-math
diff --git a/wmake/rules/solarisGcc/c++Prof b/wmake/rules/solarisGcc/c++Prof
deleted file mode 100644
index 7381654c2b469c7c61b27f21ed7090c2c4666dd3..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG       = -pg
-c++OPT        = -O2 -fno-schedule-insns
diff --git a/wmake/rules/solarisGcc/cDebug b/wmake/rules/solarisGcc/cDebug
deleted file mode 100644
index 72b638f458220e329d52b59e3566a3c807101f9d..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/solarisGcc/cOpt b/wmake/rules/solarisGcc/cOpt
deleted file mode 100644
index b0ce51585486811e127263b8755a7c88e5ab1f99..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O2 -fno-schedule-insns
diff --git a/wmake/rules/solarisGcc/cProf b/wmake/rules/solarisGcc/cProf
deleted file mode 100644
index 79a3be914fee5fab9eadbccabb9bd2e04b1cc9f4..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2 -fno-schedule-insns
diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general
deleted file mode 100644
index 2e6e7b1f40b057a7afed90dec5546f376e0811a0..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/general
+++ /dev/null
@@ -1,9 +0,0 @@
-CPP        = /usr/lib/cpp -undef
-
-PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
-
-include $(GENERAL_RULES)/standard
-
-include $(DEFAULT_RULES)/X
-include $(DEFAULT_RULES)/c
-include $(DEFAULT_RULES)/c++
diff --git a/wmake/rules/solarisGcc/mplibMPI b/wmake/rules/solarisGcc/mplibMPI
deleted file mode 100644
index 1d65b13f2116e0b849f247f9ad1bce6939b4d534..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/mplibMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -isystem $(MPI_ROOT)/include
-PLIBS      = -L$(MPI_ROOT)/lib/$(MPI_ARCH) -lmpi
diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH
deleted file mode 100644
index 0fc1f3efe9951e3ec70076fc9ea0b4e3b69635e4..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio