diff --git a/etc/bashrc b/etc/bashrc
index 1ddb55affcfe96421a4c43d11c6baa26a3c60027..f076066796e38214da622d93f505bb2bb8a33057 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -65,7 +65,7 @@ unset rc
 export WM_COMPILER_TYPE=system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[12] | GccKNL |
 #   Clang | Clang3[7-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 776494b2dd0f427e8f29727e94dd4a944a8a3f56..57e413e09059e6ada638984548c67537ed85bbba 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -74,6 +74,9 @@ case ThirdParty:
     case Gcc81:
         set gcc_version=gcc-8.1.0
         breaksw
+    case Gcc82:
+        set gcc_version=gcc-8.2.0
+        breaksw
     case Clang:
     case Clang37:
         set clang_version=llvm-3.7.1
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 614748e5e56aacd8956718f2deab735d0a388168..3dd3abd63be21b16846685364f55bb22000b89a9 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -72,6 +72,9 @@ ThirdParty)
     Gcc81)
         gcc_version=gcc-8.1.0
         ;;
+    Gcc82)
+        gcc_version=gcc-8.2.0
+        ;;
     Clang | Clang37)
         clang_version=llvm-3.7.1
         ;;
diff --git a/etc/cshrc b/etc/cshrc
index 6333be76e0ae3329734e7c551b2e4432a77f7da0..165a8a5e2f1028ec4c6f49ee5ef47f553b00a7e5 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -63,7 +63,7 @@ set 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] | Gcc8[1] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[12] | GccKNL |
 #   Clang | Clang3[7-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm
 setenv WM_COMPILER Gcc