diff --git a/vtk-5.2.1-pythondestdir.patch b/vtk-5.2.0-pythondestdir.patch
similarity index 87%
rename from vtk-5.2.1-pythondestdir.patch
rename to vtk-5.2.0-pythondestdir.patch
index 20e0ba9..3668d55 100644
--- a/vtk-5.2.1-pythondestdir.patch
+++ b/vtk-5.2.0-pythondestdir.patch
@@ -5,7 +5,7 @@
      # Create default python setup arguments if they are not set.
      IF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
 -      SET(VTK_PYTHON_SETUP_ARGS "--prefix=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
-+      SET(VTK_PYTHON_SETUP_ARGS "-O1 --root=\"${DOLLAR}ENV{RPM_BUILD_ROOT}\""
++      SET(VTK_PYTHON_SETUP_ARGS "--root=\"${DOLLAR}{CMAKE_INSTALL_PREFIX}\""
          CACHE STRING "Arguments passed to \"python setup.py install ...\" during installation.")
        MARK_AS_ADVANCED(VTK_PYTHON_SETUP_ARGS)
      ENDIF(NOT DEFINED VTK_PYTHON_SETUP_ARGS)
diff --git a/vtk.spec b/vtk.spec
index ae9e293..2d3b977 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -7,14 +7,14 @@
 Summary: The Visualization Toolkit - A high level 3D visualization library
 Name: vtk
 Version: 5.4.2
-Release: 31%{?dist}
+Release: 33%{?dist}
 # This is a variant BSD license, a cross between BSD and ZLIB.
 # For all intents, it has the same rights and restrictions as BSD.
 # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
 License: BSD
 Group: System Environment/Libraries
 Source: http://www.vtk.org/files/release/5.4/%{name}-%{version}.tar.gz
-Patch0: vtk-5.2.1-pythondestdir.patch
+Patch0: vtk-5.2.0-pythondestdir.patch
 Patch1: vtk-5.2.0-gcc43.patch
 URL: http://vtk.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -194,8 +194,8 @@ cmake_command="cmake . \
  -DVTK_USE_QVTK=ON \
 %if %{with qt4}
  -DDESIRED_QT_VERSION=4 \
- -DQT_MOC_EXECUTABLE=%{_libdir}/qt4/bin/moc \
- -DVTK_INSTALL_QT_DIR=`qmake-qt4 -query QT_INSTALL_PREFIX`/plugins/designer \
+ -DQT_MOC_EXECUTABLE=`pkg-config --variable=moc_location QtCore` \
+ -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
 %else
  -DDESIRED_QT_VERSION:STRING=3 \
  -DVTK_INSTALL_QT_DIR=`qmake -query QT_INSTALL_PREFIX`/plugins/designer \
@@ -230,6 +230,7 @@ if [ "%{_lib}" != lib -a "`ls %{buildroot}%{_prefix}/lib/*`" != "" ]; then
   mkdir -p %{buildroot}%{_libdir}
   mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}/
 fi
+mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
 
 # Gather list of non-python/tcl libraries
 ls %{buildroot}%{_libdir}/*.so.* \
@@ -237,8 +238,8 @@ ls %{buildroot}%{_libdir}/*.so.* \
 
 # List of executable utilities
 cat > utils.list << EOF
-vtkParseOGLExt
 vtkEncodeString
+lproj
 EOF
 
 # List of executable examples
@@ -300,7 +301,6 @@ done
 cat libs.list utils.list > main.list
 
 # Make shared libs and scripts executable
-mv %{buildroot}%{_libdir}/vtk-5.4/lib*.so* %{buildroot}%{_libdir}/
 chmod a+x %{buildroot}%{_libdir}/lib*.so.*
 chmod a+x %{buildroot}%{_libdir}/vtk-5.4/doxygen/*.pl
 chmod a+x %{buildroot}%{_libdir}/vtk-5.4/testing/*.{py,tcl}
@@ -315,9 +315,11 @@ find Utilities/Upgrading -type f | xargs chmod -x
 
 # Add exec bits to shared libs ...
 #chmod 0755 %{buildroot}%{_libdir}/vtk-5.4/CMake/*.so
-# Set proper perms on python shared libs ...
 chmod 0755 %{buildroot}%{_libdir}/python*/site-packages/vtk/*.so
 
+# Verdict places the docs in the false folder
+rm -fr %{buildroot}%{_libdir}/vtk-5.4/doc
+
 %check
 #LD_LIBARARY_PATH=`pwd`/bin ctest -V
 
@@ -400,9 +402,6 @@ rm -rf %{buildroot}
 %doc vtk-examples-5.4/Examples
 
 %changelog
-* Thu Jun 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.4.2-31
-- Fix pythondestdir patch file name
-
 * Sat Jun  6 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 5.4.2-30
 - Update to 5.4.2.