diff --git a/etc/bashrc b/etc/bashrc
index 5a25c06aff..3fec1e4351 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -62,7 +62,7 @@ foamInstall=$HOME/$WM_PROJECT
 foamCompiler=system
 
 #- Compiler:
-#    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc)
+#    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49| Clang | Icc
 export WM_COMPILER=Gcc
 unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index 26be1f389e..c12ca3268c 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -216,17 +216,14 @@ case OpenFOAM:
 case ThirdParty:
     switch ("$WM_COMPILER")
     case Gcc:
-    case Gcc++0x:
     case Gcc48:
-    case Gcc48++0x:
         set gcc_version=gcc-4.8.2
         set gmp_version=gmp-5.1.2
         set mpfr_version=mpfr-3.1.2
         set mpc_version=mpc-1.0.1
         breaksw
     case Gcc49:
-    case Gcc49++0x:
-        set gcc_version=gcc-4.9.0
+        set gcc_version=gcc-4.9.2
         set gmp_version=gmp-5.1.2
         set mpfr_version=mpfr-3.1.2
         set mpc_version=mpc-1.0.1
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 92d7a72a43..7b01511433 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -240,14 +240,14 @@ fi
 case "${foamCompiler}" in
 OpenFOAM | ThirdParty)
     case "$WM_COMPILER" in
-    Gcc | Gcc++0x | Gcc48 | Gcc48++0x)
+    Gcc | Gcc48)
         gcc_version=gcc-4.8.2
         gmp_version=gmp-5.1.2
         mpfr_version=mpfr-3.1.2
         mpc_version=mpc-1.0.1
         ;;
-    Gcc49 | Gcc49++0x)
-        gcc_version=gcc-4.9.0
+    Gcc49)
+        gcc_version=gcc-4.9.2
         gmp_version=gmp-5.1.2
         mpfr_version=mpfr-3.1.2
         mpc_version=mpc-1.0.1
diff --git a/etc/cshrc b/etc/cshrc
index a85a5bafc5..7919fe4112 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -61,7 +61,7 @@ if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
 setenv foamCompiler system
 
 #- Compiler:
-#    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc)
+#    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49 | Clang | Icc
 setenv WM_COMPILER Gcc
 setenv WM_COMPILER_ARCH # defined but empty
 unsetenv WM_COMPILER_LIB_ARCH