diff --git a/paraview.spec b/paraview.spec
index fe967fb..d1b8b1b 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -9,6 +9,12 @@
 %global pv_majmin %{pv_maj}.%{pv_min}
 %global rcver RC3
 
+# VTK currently is carrying local modifications to gl2ps
+%bcond_with gl2ps
+%if !%{with gl2ps}
+%global vtk_use_system_gl2ps -DVTK_USE_SYSTEM_GL2PS:BOOL=OFF
+%endif
+
 # We need jsoncpp >= 0.7
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %global system_jsoncpp 1
@@ -27,7 +33,6 @@
 %global vtk_use_system_pugixml -DVTK_USE_SYSTEM_PUGIXML:BOOL=OFF
 %endif
 
-
 Name:           paraview
 Version:        %{pv_majmin}.%{pv_patch}
 Release:        0.7%{?rcver:.%rcver}%{?dist}
@@ -65,7 +70,9 @@ BuildRequires:  gnuplot
 BuildRequires:  wget
 BuildRequires:  boost-devel
 BuildRequires:  eigen3-devel
+%if 0%{with gl2ps}
 BuildRequires:  gl2ps-devel >= 1.3.8
+%endif
 BuildRequires:  hwloc-devel
 %if %{system_jsoncpp}
 BuildRequires:  jsoncpp-devel >= 0.7.0
@@ -172,6 +179,7 @@ Provides: bundled(xdmf2)
         -DVTK_USE_SYSTEM_LIBRARIES=ON \\\
         -DVTK_USE_SYSTEM_HDF5=ON \\\
         -DVTK_USE_SYSTEM_AUTOBAHN:BOOL=ON \\\
+        %{?vtk_use_system_gl2ps} \\\
         %{?vtk_use_system_jsoncpp} \\\
         -DVTK_USE_SYSTEM_LIBPROJ4=OFF \\\
         -DVTK_USE_SYSTEM_MPI4PY:BOOL=ON \\\
@@ -346,7 +354,7 @@ done
 %if %{system_pugixml}
 rm ThirdParty/pugixml/pugixml.*
 %endif
-for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtkmpi4py vtknetcdf vtkoggtheora vtkpng vtksqlite vtktiff twisted vtkzlib zope
+for x in autobahn vtkexpat vtkfreetype %{?_with_gl2ps:vtkgl2ps} vtkhdf5 vtkjpeg vtklibxml2 vtkmpi4py vtknetcdf vtkoggtheora vtkpng vtksqlite vtktiff twisted vtkzlib zope
 do
   rm -r VTK/ThirdParty/*/${x}
 done
@@ -580,7 +588,10 @@ update-mime-database \
 
 
 %changelog
-* Sat Oct 29 2016 Orion Poplawski <orion@cora.nwra.com> - 5.2.0-0.j.RC3
+* Fri Nov 4 2016 Orion Poplawski <orion@cora.nwra.com> - 5.2.0-0.7.RC3
+- Build with bundled gl2ps
+
+* Sat Oct 29 2016 Orion Poplawski <orion@cora.nwra.com> - 5.2.0-0.7.RC3
 - Update to 5.2.0-RC3
 - Drop libjsoncpp patch applied upstream