diff --git a/etc/bashrc b/etc/bashrc
index 65ee7c61f95fbb7bea7bffe29875981a78730bbf..99cfe44af0d7e5f0175c5a39ae6b3125c1d501c5 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -60,7 +60,7 @@ unset rc
 export WM_COMPILER_TYPE=system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL |
 #   Clang | Clang3[8-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm
 export WM_COMPILER=Gcc
 
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index ab3cbddc305c2ffd118e6e137a9b10def98b1ff9..26d9cc084a00434cfbdbb3b57f34e1fa88345553 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -69,6 +69,9 @@ case ThirdParty:
     case Gcc73:
         set gcc_version=gcc-7.3.0
         breaksw
+    case Gcc81:
+        set gcc_version=gcc-8.1.0
+        breaksw
     case Clang:
         set clang_version=llvm-3.7.1
         breaksw
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index b3d6acccac671c2dcec40aaa03dfccbbcf85b0af..08b306b2d1db45786caf3cdc05743273c65fb8a4 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -68,6 +68,9 @@ ThirdParty)
     Gcc73)
         gcc_version=gcc-7.3.0
         ;;
+    Gcc81)
+        gcc_version=gcc-8.1.0
+        ;;
     Clang)
         clang_version=llvm-3.7.1
         ;;
diff --git a/etc/cshrc b/etc/cshrc
index 16468edf04f9aefca5f45e19f2b42fc577b90ddc..db8ac55a7df55a1b3cc1e5ba70a7acb7af68ca87 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,7 +57,7 @@ setenv FOAM_INST_DIR `lsof +p $$ |& \
 setenv WM_COMPILER_TYPE system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL |
 #   Clang | Clang3[8-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm
 setenv WM_COMPILER Gcc