diff --git a/paraview-cstddef.patch b/paraview-cstddef.patch
new file mode 100644
index 0000000..0e84544
--- /dev/null
+++ b/paraview-cstddef.patch
@@ -0,0 +1,11 @@
+diff -up ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddeff ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx
+--- ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx.cstddeff	2013-12-24 19:17:44.000000000 -0700
++++ ParaView-v4.1.0-RC2/VTK/Rendering/ParallelLIC/vtkPSurfaceLICComposite.cxx	2013-12-30 15:19:14.469386213 -0700
+@@ -33,6 +33,7 @@
+ #include "vtkgl.h"
+ #include "vtkMPI.h"
+ 
++#include <cstddef>
+ #include <list>
+ #include <deque>
+ #include <vector>
diff --git a/paraview-install.patch b/paraview-install.patch
index 529e32f..6103008 100644
--- a/paraview-install.patch
+++ b/paraview-install.patch
@@ -1,12 +1,24 @@
-diff -up ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
---- ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt.install	2012-12-03 08:31:22.000000000 -0700
-+++ ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt	2012-12-05 11:20:52.659956535 -0700
-@@ -82,7 +82,7 @@ set (SQTK_VERSION "SQTK-${SQTK_RELEASE}
- 
- # put the plugin inside the pv install
- set(SQTK_LIB_INSTALL_PATH
--  "${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}"
-+  "${PV_INSTALL_LIB_DIR}"
-   )
- #message(STATUS "SQTK will be installed at ${SQTK_LIB_INSTALL_PATH}")
+diff -up ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt.install ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt
+--- ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt.install	2013-12-24 19:16:21.000000000 -0700
++++ ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt	2013-12-30 21:05:56.024880083 -0700
+@@ -102,7 +102,7 @@ if(PARAVIEW_BUILD_QT_GUI)
+     LINK_PRIVATE pqComponents)
+ endif()
  
+-install(TARGETS SciberQuestToolKit DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR})
++install(TARGETS SciberQuestToolKit DESTINATION ${PV_INSTALL_LIB_DIR})
+ 
+ if(PARAVIEW_USE_MPI)
+   include(vtkMPI)
+diff -up ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt.install ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
+--- ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt.install	2013-12-24 19:16:21.000000000 -0700
++++ ParaView-v4.1.0-RC2/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt	2013-12-30 21:05:31.864032186 -0700
+@@ -162,7 +162,7 @@ if (SQTK_CUDA AND CUDA_FOUND)
+   LINK_PRIVATE ${CUDA_LIBRARIES})
+ endif()
+ 
+-install(TARGETS vtkSciberQuest DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR})
++install(TARGETS vtkSciberQuest DESTINATION ${PV_INSTALL_LIB_DIR})
+ 
+ if (BUILD_TESTING)
+   add_subdirectory(Testing)
diff --git a/paraview.spec b/paraview.spec
index 94d9ec2..c4c97ce 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -30,8 +30,11 @@ Patch1:         vtk-6.1.0-system.patch
 # Capitalize Protobuf so it finds FindProtobuf.cmake
 # http://paraview.org/Bug/view.php?id=13656
 Patch2:         paraview-4.0.1-Protobuf.patch
-#Patch to vtk to use system netcdf library
+# Patch to vtk to use system netcdf library
 Patch3:         vtk-6.1.0-netcdf.patch
+# Patch to use cstddef
+# http://paraview.org/Bug/view.php?id=14493
+Patch4:         paraview-cstddef.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -103,6 +106,7 @@ Provides:       paraview-doc = %{version}-%{release}
         -DPARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON \\\
         -DPARAVIEW_USE_SYSTEM_MPI4PY:BOOL=ON \\\
         -DVTK_CUSTOM_LIBRARY_SUFFIX="" \\\
+        -DVTK_INSTALL_DATA_DIR=share/paraview \\\
         -DVTK_INSTALL_PACKAGE_DIR=share/cmake/paraview \\\
         -DVTK_PYTHON_SETUP_ARGS="--prefix=/usr --root=%{buildroot}" \\\
         -DVTK_USE_BOOST:BOOL=ON \\\
@@ -237,9 +241,11 @@ developing applications that use %{name}-mpich.
 
 %prep
 %setup -q -n ParaView-v%{version}%{rcver}
+%patch0 -p1 -b .install
 %patch1 -p0 -b .system
 %patch2 -p1 -b .Protobuf
 %patch3 -p0 -b .netcdf
+%patch4 -p1 -b .cstddef
 # Install python properly
 sed -i -s '/VTK_INSTALL_PYTHON_USING_CMAKE/s/TRUE/FALSE/' CMakeLists.txt
 #Remove included thirdparty sources just to be sure
@@ -268,6 +274,8 @@ pushd fedora
         -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/paraview \
         -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/paraview \
         -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+        -DQtTesting_INSTALL_LIB_DIR=%{_lib}/paraview \
+        -DQtTesting_INSTALL_CMAKE_DIR=%{_lib}/paraview/CMake \
         %{paraview_cmake_options}
 make VERBOSE=1 %{?_smp_mflags}
 popd
@@ -281,6 +289,8 @@ cmake .. \
         -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \
         -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \
         -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+        -DQtTesting_INSTALL_LIB_DIR=lib/paraview \
+        -DQtTesting_INSTALL_CMAKE_DIR=lib/paraview/CMake \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
         -DMPI_COMPILER:FILEPATH=%{_libdir}/openmpi/bin/mpicxx \
@@ -301,6 +311,8 @@ cmake .. \
         -DVTK_INSTALL_ARCHIVE_DIR:PATH=lib/paraview \
         -DVTK_INSTALL_LIBRARY_DIR:PATH=lib/paraview \
         -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON \
+        -DQtTesting_INSTALL_LIB_DIR=lib/paraview \
+        -DQtTesting_INSTALL_CMAKE_DIR=lib/paraview/CMake \
         -DPARAVIEW_USE_MPI:BOOL=ON \
         -DICET_BUILD_TESTING:BOOL=ON \
         -DMPI_COMPILER:FILEPATH=%{_libdir}/mpich/bin/mpicxx \
@@ -331,8 +343,9 @@ install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages
 pushd fedora-openmpi
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#Remove mpi copy of doc and man pages
-rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{doc,man}
+#Remove mpi copy of doc and man pages and  data
+rm -rf $RPM_BUILD_ROOT%{_libdir}/openmpi/share/{doc,man,paraview}
+ln -sf ../../../share/paraview $RPM_BUILD_ROOT%{_libdir}/openmpi/share/
 popd
 %endif
 
@@ -341,8 +354,9 @@ popd
 pushd fedora-mpich
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#Remove mpi copy of doc and man pages
-rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich/share/{doc,man}
+#Remove mpi copy of doc and man pages and data
+rm -rf $RPM_BUILD_ROOT%{_libdir}/mpich/share/{doc,man,paraview}
+ln -sf ../../../share/paraview $RPM_BUILD_ROOT%{_libdir}/openmpi/share/
 popd
 %endif
 
@@ -371,7 +385,7 @@ desktop-file-install \
        paraview.desktop
 
 #Cleanup only vtk conflicting binaries
-rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},ProcessShader,Wrap{Hierarchy,Java,Python,Tcl}}*
+rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},Wrap{Hierarchy,Java,Python,Tcl}}*
 popd
 
 # Strip build dir from VTKConfig.cmake (bug #917425)
@@ -424,6 +438,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/applications/*paraview.desktop
 %{_datadir}/pixmaps/paraview_22x22.png
 %{_datadir}/mime/packages/paraview.xml
+%{_datadir}/paraview/
 
 %files devel
 %{_bindir}/vtkWrapClientServer
@@ -443,6 +458,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/openmpi/bin/vtk*
 %{_libdir}/openmpi/include/paraview/
 %{_libdir}/openmpi/share/cmake/
+%{_libdir}/openmpi/share/paraview
 %endif
 
 
@@ -456,10 +472,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libdir}/mpich/bin/vtk*
 %{_libdir}/mpich/include/paraview/
 %{_libdir}/mpich/share/cmake/
+%{_libdir}/mpich/share/paraview
 %endif
 
 
 %changelog
+* Mon Dec 30 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0-0.1.rc2
+- Rebase install patch
+- Add patch to include needed cstddef for gcc 4.8.2
+- Set VTK_INSTALL_DATA_DIR
+- Set QtTesting_* install macros
+
 * Fri Dec 27 2013 Orion Poplawski <orion@cora.nwra.com> - 4.1.0-0.1.rc2
 - Update to 4.1.0-RC2