diff --git a/cmake-2.6.4-vtk64.patch b/cmake-2.6.4-vtk64.patch
new file mode 100644
index 0000000..9bee3da
--- /dev/null
+++ b/cmake-2.6.4-vtk64.patch
@@ -0,0 +1,16 @@
+--- cmake-2.6.4/Modules/FindVTK.cmake.vtk64	2009-04-28 14:22:59.000000000 -0600
++++ cmake-2.6.4/Modules/FindVTK.cmake	2009-06-03 10:01:25.580512670 -0600
+@@ -45,9 +45,13 @@
+   SET(VTK_DIR_SEARCH "")
+   FOREACH(dir ${VTK_DIR_SEARCH2})
+     SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
++      ${dir}/../lib64/vtk-5.2
+       ${dir}/../lib/vtk-5.2
++      ${dir}/../lib64/vtk-5.1
+       ${dir}/../lib/vtk-5.1
++      ${dir}/../lib64/vtk-5.0
+       ${dir}/../lib/vtk-5.0
++      ${dir}/../lib64/vtk
+       ${dir}/../lib/vtk
+       )
+   ENDFOREACH(dir)
diff --git a/cmake.spec b/cmake.spec
index 8968178..b5a5fe6 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -8,7 +8,7 @@
 
 Name:           cmake
 Version:        2.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -16,8 +16,9 @@ License:        BSD
 URL:            http://www.cmake.org
 Source0:        http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz
 Source2:        macros.cmake
-# fix crash during kdepimlibs build
-# https://bugzilla.redhat.com/show_bug.cgi?id=475876
+#Find UseVTK.cmake in /usr/lib64/vtk-* on 64-bit machines
+#http://public.kitware.com/mantis/view.php?id=9105
+Patch0:         cmake-2.6.4-vtk64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ncurses-devel, libX11-devel
@@ -52,6 +53,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 
 %prep
 %setup -q -n %{name}-%{version}%{rcver}
+%patch0 -p1 -b .vtk64
 # Fixup permissions
 find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
 
@@ -130,6 +132,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Jun 3 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.4-2
+- Add patch to find VTK on 64-bit machines (bug #503945)
+
 * Wed Apr 29 2009 Orion Poplawski <orion@cora.nwra.com> - 2.6.4-1
 - Update to 2.6.4
 - Drop patch for bug #475876 fixed upstream