diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3
index 4da014127..7f2aaabae 100755
--- a/ThirdParty/AllMake.stage3
+++ b/ThirdParty/AllMake.stage3
@@ -63,7 +63,7 @@ then
     #
     [ ! -z "$WM_THIRD_PARTY_USE_METIS_510" ] && {
 	echo "Building metis 5.1.0"
-	( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/metis-5.1.0.tar.gz )
+	( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/metis-5.1.0.tar.gz )
     }
 else
     echo "Using system installed Metis"
@@ -78,7 +78,7 @@ then
     [ ! -z "$WM_THIRD_PARTY_USE_PARMGRIDGEN_10" ] && {
 	echo "Building ParMGridGen 1.0"
         #( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz       )
-	    ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParMGridGen-1.0.tar.gz )
+	    ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParMGridGen-1.0.tar.gz )
     }
 else
     echo "Using system installed ParMGridGen"
@@ -106,7 +106,7 @@ then
     #
     [ ! -z "$WM_THIRD_PARTY_USE_MESQUITE_212" ] && {
 	echo "Building Mesquite 2.1.2"
-	( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/mesquite-2.1.2.tar.gz )
+	( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/mesquite-2.1.2.tar.gz )
     }
 else
     echo "Using system installed Mesquite"
@@ -127,13 +127,13 @@ then
     [ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_604" ] && {
 	echo "Building Scotch 6.0.4"
 	#( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz )
-	( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u  http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch_6.0.4.tar.gz )
+	( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u  http://downloads.sourceforge.net/project/foam-extend/ThirdParty/scotch_6.0.4.tar.gz )
     }
     # Scotch 6.0.0
     #
     [ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_600" ] && {
 	echo "Building Scotch 6.0.0"
-	( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch-6.0.0.tar.gz )
+	( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/scotch-6.0.0.tar.gz )
     }
 else
     echo "Using system installed Scotch"
@@ -196,13 +196,13 @@ then
     [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_1101" ] && {
 	echo "Building hwloc 1.10.1"
     # ( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec  -u http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.1.tar.gz )
-	( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.10.1.tar.gz )
+	( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec  -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/hwloc-1.10.1.tar.gz )
     }
     # hwloc 1.7.2
     #
     [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_172" ] && {
 	echo "Building hwloc 1.7.2"
-	( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.7.2.tar.gz )
+	( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec  -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/hwloc-1.7.2.tar.gz )
     }
 else
     echo "Using system installed hwloc"
diff --git a/ThirdParty/AllMake.stage4 b/ThirdParty/AllMake.stage4
index 6ea436735..8f3a0a7f5 100755
--- a/ThirdParty/AllMake.stage4
+++ b/ThirdParty/AllMake.stage4
@@ -80,28 +80,36 @@ then
     then
         # ParaView 4.0.1
         #
-	[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_401" ] && {
-	    echo "Building ParaView 4.0.1"
-            ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \
+        [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_401" ] && {
+            echo "Building ParaView 4.0.1"
+            ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.0.1-source.tgz \
 		-f --define='_qmakePath $QT_BIN_DIR/qmake'
             )
-	}
+        }
         # ParaView 4.1.0
         #
-	[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_410" ] && {
-	    echo "Building ParaView 4.1.0"
-            ( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.1.0-source.tar.gz \
+        [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_410" ] && {
+            echo "Building ParaView 4.1.0"
+            ( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.1.0-source.tar.gz \
 		-f --define='_qmakePath $QT_BIN_DIR/qmake'
             )
-	}
+        }
         # ParaView 4.3.1
         #
-	[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_431" ] && {
-	    echo "Building ParaView 4.3.1"
-            ( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.3.1-source.tar.gz \
+        [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_431" ] && {
+            echo "Building ParaView 4.3.1"
+            ( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.3.1-source.tar.gz \
 		-f --define='_qmakePath $QT_BIN_DIR/qmake'
             )
-	}
+        }
+        # ParaView 4.4.0
+        #
+        [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_440" ] && {
+            echo "Building ParaView 4.4.0"
+            ( rpm_make -p ParaView-4.4.0 -s ParaView-4.4.0.spec -u http://downloads.sourceforge.net/project/foam-extend/ThirdParty/ParaView-v4.4.0-source.tar.gz \
+		-f --define='_qmakePath $QT_BIN_DIR/qmake'
+            )
+        }
     else
         echo "WARNING: "
         echo "WARNING: Skipping the installation of ParaView-4.x.x."
diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-4.4.0.spec b/ThirdParty/rpmBuild/SPECS/ParaView-4.4.0.spec
new file mode 100644
index 000000000..f3eb456d4
--- /dev/null
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-4.4.0.spec
@@ -0,0 +1,296 @@
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | foam-extend: Open Source CFD
+#  \\    /   O peration     |
+#   \\  /    A nd           | For copyright notice see file Copyright
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of foam-extend.
+#
+#     foam-extend is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation, either version 3 of the License, or (at your
+#     option) any later version.
+#
+#     foam-extend is distributed in the hope that it will be useful, but
+#     WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with foam-extend.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     RPM spec file for ParaView-4.4.0
+#
+# Description
+#     RPM spec file for creating a relocatable RPM
+#
+# Authors:
+#     Martin Beaudoin, Hydro-Quebec, (2010)
+#     Andreas Feymark, Chalmers University of Technology, (2013)
+#
+#------------------------------------------------------------------------------
+
+# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable
+%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)}
+%{expand:%%define _WM_OPTIONS         %(echo $WM_OPTIONS)}
+
+# Disable the generation of debuginfo packages
+%define debug_package %{nil}
+
+# Turning off the Fascist build policy
+# Useful for debugging the install section
+%define _unpackaged_files_terminate_build 0
+
+# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory
+%define _topdir	 	%{_WM_THIRD_PARTY_DIR}/rpmBuild
+%define _tmppath	%{_topdir}/tmp
+
+# Will install the package directly $WM_THIRD_PARTY_DIR
+#   Some comments about package relocation:
+#   By using this prefix for the Prefix:  parameter in this file, you will make this 
+#   package relocatable. 
+#
+#   This is fine, as long as your software is itself relocatable.
+#
+#   Simply take note that libraries built with libtool are not relocatable because the
+#   prefix we specify will be hard-coded in the library .la files.
+#   Ref: http://sourceware.org/autobook/autobook/autobook_80.html
+#
+#   In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will
+#   not be able to reutilize this RPM, even though it is relocatable. You will need to 
+#   regenerate the RPM.
+#
+%define _prefix         %{_WM_THIRD_PARTY_DIR}
+
+%define name		ParaView
+%define release		%{_WM_OPTIONS}
+%define version 	4.4.0
+
+%define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
+
+BuildRoot:	        %{buildroot}
+Summary: 		ParaView
+License: 		Unkown
+Name: 			%{name}
+Version: 		%{version}
+Release: 		%{release}
+URL:                    http://www.paraview.org/files/v4.4/
+Source: 		%url/%{name}-v%{version}-source.tar.gz
+Prefix: 		%{_prefix}
+Group: 			Development/Tools
+Patch0:                 ParaView-4.4.0.patch_darwin
+
+%define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
+
+#--------------------------------------------------------------------------
+#
+# Here, we define default compiling options for cmake
+#
+# One can override the option on the commande line : --define='MACRO EXPR'
+#
+%{!?_withVerbose:     %define _withVerbose     false}
+%{!?_withMesa:        %define _withMesa        false}
+%{!?_withMPI:         %define _withMPI         false}
+%{!?_withPython:      %define _withPython      false}
+%{!?_withQt:          %define _withQt          true}
+%{!?_qmakePath:       %define _qmakePath       Undefined}
+%{!?_mesaIncludePath: %define _mesaIncludePath Undefined}
+%{!?_mesaLibPath:     %define _mesaLibPath     Undefined}
+%{!?_pythonLibPath:   %define _pythonLibPath   Undefined}
+
+#--------------------------------------------------------------------------
+
+%description
+%{summary}
+
+%prep
+%setup -q -n %{name}-v%{version}-source
+
+%ifos darwin
+%patch0 -p1
+%endif
+
+%build
+#
+# set CMake cache variables
+#
+    addCMakeVariable()
+    {
+        while [ -n "$1" ]
+        do
+            CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1"
+            shift
+        done
+   }
+
+    # export WM settings in a form that GNU configure recognizes
+    [ -n "$WM_CC" ]         &&  export CC="$WM_CC"
+    [ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
+    [ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
+    [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
+    [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
+
+    set +x
+    echo ""
+    echo "Compilation options:"
+    echo "     _withVerbose     : %{_withVerbose}"
+    echo "     _withMesa        : %{_withMesa}"
+    echo "     _withMPI         : %{_withMPI}"
+    echo "     _withPython      : %{_withPython}"
+    echo "     _withQt          : %{_withQt}"
+    echo "     _qmakePath       : %{_qmakePath}"
+    echo "     _mesaIncludePath : %{_mesaIncludePath}"
+    echo "     _mesaLibPath     : %{_mesaLibPath}"
+    echo "     _pythonLibPath   : %{_pythonLibPath}"
+    echo ""
+    set -x
+
+    # start with these general settings
+    addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON
+    addCMakeVariable  CMAKE_BUILD_TYPE:STRING=Release
+    addCMakeVariable  BUILD_TESTING:BOOL=OFF
+
+    # We build with Python. This is ust too useful
+    addCMakeVariable  PARAVIEW_ENABLE_PYTHON:BOOL=ON
+
+    # include development files in "make install"
+    addCMakeVariable  PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
+
+%ifos darwin
+    # Additional installation rules for Mac OSX 
+    addCMakeVariable  PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-v%{version}-source/Applications/ParaView-4.4.0_extra_install_Darwin.cmake
+
+    # We activate the new Unix-style installation for Mac OS X
+    addCMakeVariable PARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
+
+    # Recent version of Mac OSX (Yosemite) cannot compile ParaView with the gcc compiler
+    # Using clang instead
+    CC=clang
+    CXX=clang++
+%endif
+
+    # Add the value of _qmakePath for QT_QMAKE_EXECUTABLE
+    addCMakeVariable  QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath}
+
+    echo "CMAKE_VARIABLES: $CMAKE_VARIABLES"
+
+    mkdir -p ./buildObj
+    cd ./buildObj
+
+    cmake \
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_installPrefix} \
+        $CMAKE_VARIABLES \
+	..
+
+    [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
+    make -j $WM_NCOMPPROCS
+
+%install
+    # On OpenSUSE, rpmbuild, will choke when detecting unreferenced symlinks
+    # created during installation.
+    # Qt version 4.6.3 will generate some unreferenced symlinks when
+    # ParaView is compiled and installed. By enabling the following
+    # environment variable, the command brp-symlink will still complain
+    # about missing link targets, but it won't stop rpmbuild from generating
+    # the final rpm.
+    # For all other Unix distros, this is a no-op.
+    export NO_BRP_STALE_LINK_ERROR=yes
+
+    cd buildObj
+    make install DESTDIR=$RPM_BUILD_ROOT
+
+%ifos darwin
+    # Cleaning up some strange install side effect from option
+    # PARAVIEW_DO_UNIX_STYLE_INSTALLS
+    # Need to revisit this section eventually.
+    if [ -d "$RPM_BUILD_ROOT/$RPM_BUILD_ROOT" ]; then
+        mv $RPM_BUILD_ROOT/$RPM_BUILD_ROOT/%{_installPrefix}/bin/* $RPM_BUILD_ROOT/%{_installPrefix}/bin
+    fi
+%endif
+
+    # Creation of foam-extend specific .csh and .sh files"
+
+    echo ""
+    echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}"
+    echo ""
+    #
+    # Generate package specific .sh file for foam-extend
+    #
+mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc
+cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export PARAVIEW_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
+export PARAVIEW_BIN_DIR=\$PARAVIEW_DIR/bin
+export PARAVIEW_LIB_DIR=\$PARAVIEW_DIR/lib
+export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-4.4
+
+export PARAVIEW_VERSION=%{version}
+
+# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins.
+#     Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the
+#     specified directory to see if a given library is a paraview plugin. 
+#     In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the
+#     startup of paraview or even make paraview crash on startup.
+export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
+
+[ -d \$PARAVIEW_LIB_DIR/paraview-4.4 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.4
+
+# Enable access to the package applications if present
+[ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR
+
+# 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
+
+    #
+    # Generate package specific .csh file for foam-extend
+    #
+cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh
+# Load %{name}-%{version} libraries and binaries if available
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
+setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
+setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
+setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-4.4
+
+setenv PARAVIEW_VERSION %{version}
+
+# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins.
+#     Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the
+#     specified directory to see if a given library is a paraview plugin. 
+#     In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the
+#     startup of paraview or even make paraview crash on startup.
+setenv PV_PLUGIN_PATH \$FOAM_LIBBIN/paraview_plugins
+
+if ( -e \$PARAVIEW_BIN_DIR ) then
+    _foamAddPath \$PARAVIEW_BIN_DIR
+endif
+
+if ( -e \$PARAVIEW_LIB_DIR/paraview-4.4 ) then
+    _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.4
+endif
+
+
+# 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
+DOT_CSH_EOF
+
+    #finally, generate a .tgz file for systems where using rpm for installing packages
+    # as a non-root user might be a problem.
+    (mkdir -p  %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz  packages/%{name}-%{version})
+
+%clean
+
+%files
+%defattr(-,root,root)
+%{_installPrefix}
+
+
diff --git a/etc/bashrc b/etc/bashrc
index c8359022b..de94a1b57 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -111,7 +111,7 @@ export WM_THIRD_PARTY_USE_HWLOC_1101=1
 #
 # For AllMake.stage4
 #export WM_THIRD_PARTY_USE_QT_486=1
-export WM_THIRD_PARTY_USE_PARAVIEW_431=1
+export WM_THIRD_PARTY_USE_PARAVIEW_440=1
 
 
 # Source files, possibly with some verbosity
diff --git a/etc/cshrc b/etc/cshrc
index 9da40eb8e..94875fce6 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -97,7 +97,7 @@ setenv WM_THIRD_PARTY_USE_HWLOC_1101 1
 #
 # For AllMake.stage4
 #setenv WM_THIRD_PARTY_USE_QT_486 1
-setenv WM_THIRD_PARTY_USE_PARAVIEW_431 1
+setenv WM_THIRD_PARTY_USE_PARAVIEW_440 1
 
 
 # Source files, possibly with some verbosity
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
index f07db0d28..7c59e8854 100644
--- a/etc/prefs.csh-EXAMPLE
+++ b/etc/prefs.csh-EXAMPLE
@@ -228,7 +228,8 @@ setenv WM_THIRD_PARTY_USE_HWLOC_1101 1
 #
 # For AllMake.stage4
 setenv WM_THIRD_PARTY_USE_QT_486 1
-setenv WM_THIRD_PARTY_USE_PARAVIEW_431 1
+setenv WM_THIRD_PARTY_USE_PARAVIEW_440 1
+#setenv WM_THIRD_PARTY_USE_PARAVIEW_431 1
 #setenv WM_THIRD_PARTY_USE_PARAVIEW_410 1
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
index 0ed4194d3..b2c490599 100644
--- a/etc/prefs.sh-EXAMPLE
+++ b/etc/prefs.sh-EXAMPLE
@@ -238,7 +238,8 @@ export WM_THIRD_PARTY_USE_HWLOC_1101=1
 #
 # For AllMake.stage4
 export WM_THIRD_PARTY_USE_QT_486=1
-export WM_THIRD_PARTY_USE_PARAVIEW_431=1
+export WM_THIRD_PARTY_USE_PARAVIEW_440=1
+#export WM_THIRD_PARTY_USE_PARAVIEW_431=1
 #export WM_THIRD_PARTY_USE_PARAVIEW_410=1
 
 
diff --git a/etc/settings.csh b/etc/settings.csh
index 586bb0add..fafa699df 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -576,8 +576,8 @@ endif
 
 # zoltan
 # ~~~~~
-if ( $?ZOLTAN_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_ZOLTAN_35 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/zoltan-3.5/platforms/$WM_OPTIONS ) then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/zoltan-3.5/platforms/$WM_OPTIONS/etc/zoltan-3.5.csh
+if ( $?ZOLTAN_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_ZOLTAN_36 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/zoltan-3.6/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/zoltan-3.6/platforms/$WM_OPTIONS/etc/zoltan-3.6.csh
 endif
 
 # Python
@@ -591,27 +591,30 @@ endif
 if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_063 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.3/platforms/noarch ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.csh
 endif
-if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_063 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.4/platforms/noarch ) then
+if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_064 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.4/platforms/noarch ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch/etc/PyFoam-0.6.4.csh
 endif
 
 # hwloc
 # ~~~~~
-if ( $?HWLOC_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_HWLOC_172 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.7.2/platforms/$WM_OPTIONS ) then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.2/platforms/$WM_OPTIONS/etc/hwloc-1.7.2.csh
-endif
 if ( $?HWLOC_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_HWLOC_1101 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.10.1/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.10.1/platforms/$WM_OPTIONS/etc/hwloc-1.10.1.csh
 endif
+if ( $?HWLOC_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_HWLOC_172 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.7.2/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.2/platforms/$WM_OPTIONS/etc/hwloc-1.7.2.csh
+endif
 
 # QT
 # ~~~~~
-if ( $?QT_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_QT_486 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS )then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.5.csh
+if ( $?QT_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_QT_486 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS )then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.6.csh
 endif
 
 # PARAVIEW
 # ~~~~~
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_440 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.4.0/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.4.0/platforms/$WM_OPTIONS/etc/ParaView-4.4.0.csh
+endif
 if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_431 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.3.1/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS/etc/ParaView-4.3.1.csh
 endif
@@ -621,14 +624,16 @@ endif
 if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_401 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.0.1/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.0.1/platforms/$WM_OPTIONS/etc/ParaView-4.0.1.csh
 endif
-
-if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_3141 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ) then
-   _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.csh
-endif
-
 if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_381 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.csh
 endif
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_3141 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ) then
+   _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.csh
+endif
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_381 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.csh
+endif
+
 
 # llvm
 # ~~~~~
diff --git a/etc/settings.sh b/etc/settings.sh
index ca4d7c062..5f2aee33e 100755
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -740,6 +740,9 @@ fi
 
 # Load ParaView
 # ~~~~~~~~~~~~~
+[ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_440 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.4.0/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.4.0/platforms/$WM_OPTIONS/etc/ParaView-4.4.0.sh
+}
 [ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_431 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS/etc/ParaView-4.3.1.sh
 }