diff --git a/etc/bashrc b/etc/bashrc
index e5c050b44f..e194bba3d0 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -131,7 +131,8 @@ unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
 
-# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA
+#                          | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
 
@@ -241,7 +242,8 @@ foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
 cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
 
 #- Clean LD_LIBRARY_PATH
-cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleaned"
+cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` \
+    && LD_LIBRARY_PATH="$cleaned"
 
 #- Clean MANPATH
 cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
@@ -257,8 +259,13 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
-_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
+paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` \
+    && _foamSource $paraview3
+unset paraview3
+
+ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` \
+    && _foamSource $ensight
+unset ensight
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/cshrc b/etc/cshrc
index 7ceff2ff58..807d38f042 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -255,8 +255,17 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
-# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
+set paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/cshrc`
+if ( $status == 0 ) then
+    _foamSource $paraview3
+endif
+unset paraview3
+
+set ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/cshrc`
+if ( $status == 0 ) then
+    _foamSource $ensight
+endif
+unset ensight
 
 
 # Clean environment paths again. Only remove duplicates