diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
index 8b597345c..24c0c6c5b 100644
--- a/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
@@ -157,6 +157,9 @@ Patch0:                 ParaView-3.8.1.patch_darwin
     addCMakeVariable  PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}/Applications/ParaView-3.8.1_extra_install_Darwin.cmake
 %endif
 
+    # Add the value of _qmakePath for QT_QMAKE_EXECUTABLE
+    addCMakeVariable  QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath}
+
     echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
 
     mkdir -p ./buildObj
@@ -216,11 +219,9 @@ export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
 # Enable access to the package applications if present
 [ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR
 
-if [ "$WM_ARCH" == "darwinIntel" ]
-then
-    # Additional binary path is running on Mac OS X
-    [ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
-fi
+# Additional binary path if running on Mac OS X
+[ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
+
 DOT_SH_EOF
 
     #
@@ -252,7 +253,7 @@ if ( -e \$PARAVIEW_LIB_DIR/paraview-3.8 ) then
 endif
 
 
-# Additional binary path is running on Mac OS X
+# Additional binary path if running on Mac OS X
 if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then
     _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS
 endif
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
index e0b063355..7b71be49b 100644
--- a/etc/prefs.csh-EXAMPLE
+++ b/etc/prefs.csh-EXAMPLE
@@ -112,6 +112,18 @@
 # So we don't use a variable called QT_SYSTEM, but instead a variable
 # called QT_THIRD_PARTY in order to override to the ThirdParty QT
 # package.
+#
+# If you choose to use the system installed version of QT, keep
+# the variable QT_THIRD_PARTY commented, and uncomment the initialization
+# of the variable QT_DIR and QT_BIN_DIR. Make sure both variables are
+# properly initialized.
+#
+# If you choose instead to use the ThirdParty version of QT, only uncomment
+# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization 
+# of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts
+# will take care of setting the variables QT_DIR and QT_BIN_DIR to the 
+# proper values.
+#
 #setenv QT_THIRD_PARTY 1
 #setenv QT_DIR path_to_system_installed_qt
 #setenv QT_BIN_DIR $QT_DIR/bin
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
index e2a65814f..07c6d2294 100644
--- a/etc/prefs.sh-EXAMPLE
+++ b/etc/prefs.sh-EXAMPLE
@@ -114,6 +114,18 @@ compilerInstall=system
 # So we don't use a variable called QT_SYSTEM, but instead a variable
 # called QT_THIRD_PARTY in order to override to the ThirdParty QT
 # package.
+#
+# If you choose to use the system installed version of QT, keep
+# the variable QT_THIRD_PARTY commented, and uncomment the initialization
+# of the variable QT_DIR and QT_BIN_DIR. Make sure both variables are
+# properly initialized.
+#
+# If you choose instead to use the ThirdParty version of QT, only uncomment
+# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization 
+# of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts
+# will take care of setting the variables QT_DIR and QT_BIN_DIR to the 
+# proper values.
+#
 #export QT_THIRD_PARTY=1
 #export QT_DIR=path_to_system_installed_qt
 #export QT_BIN_DIR=$QT_DIR/bin