diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index dad1d03f7e..d817b428bb 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -542,6 +542,7 @@ endif
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 #- keep _foamAddPath _foamAddLib _foamAddMan
-unset foamCompiler minBufferSize
+unset minBufferSize
+unsetenv foamCompiler
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/etc/cshrc b/etc/cshrc
index 06d5922c7c..df90234792 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,8 +57,8 @@ set foamInstall = $HOME/$WM_PROJECT
 if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
 
 #- Compiler location:
-#    foamCompiler= system | ThirdParty (OpenFOAM)
-set foamCompiler=system
+#    foamCompiler = system | ThirdParty (OpenFOAM)
+setenv foamCompiler system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Clang | Icc (Intel icc)