diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh
index 2e3f81f0e4ec43a2db927eea4437ac0b4c1b946d..5f7dceecc266dc830ac44d18774df83dc06d11f6 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config/CGAL.csh
@@ -41,6 +41,10 @@ if ($?FOAM_VERBOSE && $?prompt) then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 endif
 
+if ( -d "$CGAL_ARCH_PATH" ) then
+    _foamAddLib $CGAL_ARCH_PATH/lib
+endif
+
 if ( -d "$BOOST_ARCH_PATH" ) then
     _foamAddLib $BOOST_ARCH_PATH/lib
 endif
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
index cc67908f10bc7e1631434c607710a87362f122b3..dc8772dd16ab16d1432d486bb2bdd8dece255f41 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config/CGAL.sh
@@ -42,6 +42,11 @@ then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 fi
 
+if [ -d "$CGAL_ARCH_PATH" ]
+then
+    _foamAddLib $CGAL_ARCH_PATH/lib
+fi
+
 if [ -d "$BOOST_ARCH_PATH" ]
 then
     _foamAddLib $BOOST_ARCH_PATH/lib
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index a3160377106a99fc2f3b461c2504319bb1e00cb8..244e52fdcfe41fffab5ba088ca8ba7e57375a531 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -562,7 +562,7 @@ endif
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unalias _foamAddPath _foamAddLib _foamAddMan
+#- keep _foamAddPath _foamAddLib _foamAddMan
 unset foamCompiler minBufferSize
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 487c550d24f8d4e7b5fdccfddb140686090ab017..4fa9120ec13e89cd06ad8a9418a29acfc535bb66 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -569,6 +569,7 @@ export MPI_BUFFER_SIZE
 
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize
+#keep _foamAddPath _foamAddLib _foamAddMan
+unset foamCompiler minBufferSize
 
 # ----------------------------------------------------------------- end-of-file