diff --git a/debian/changelog b/debian/changelog
index 589e03ee6..46b58f654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ cmake (2.6.4-3) UNRELEASED; urgency=low
     is capable of finding Sun Java, OpenJDK, Kaffe and GCJ (if latter is
     default-java) JVMs. Support for Debian specific /usr/lib/jvm/default-java is
     also included. Patch FindJNI.cmake-more-arches.diff (Closes: #544674).
+  * Backport Modules/FindVTK.cmake from CMake 2.8 CVS. It adds support for VTK
+    5.4. Patch FindVTK.cmake-vtk-5.4.diff (Closes: #546030).
 
  -- Modestas Vainius <modestas@vainius.eu>  Fri, 21 Aug 2009 21:48:12 +0300
 
diff --git a/debian/patches/FindVTK.cmake-vtk-5.4.diff b/debian/patches/FindVTK.cmake-vtk-5.4.diff
new file mode 100644
index 000000000..6b847d1bc
--- /dev/null
+++ b/debian/patches/FindVTK.cmake-vtk-5.4.diff
@@ -0,0 +1,36 @@
+Subject: Modules/FindJNI.cmake: support VTK 5.4
+ Backport Modules/FindJNI.cmake from CMake 2.8 CVS.
+Origin: upstream, http://public.kitware.com/cgi-bin/viewcvs.cgi/Modules/FindVTK.cmake?root=CMake&r1=1.29&r2=1.31&view=patch
+Bug: http://public.kitware.com/Bug/view.php?id=8804
+Bug-Debian: http://bugs.debian.org/546030
+
+--- a/Modules/FindVTK.cmake
++++ b/Modules/FindVTK.cmake
+@@ -27,6 +27,19 @@
+ #                 instead.
+ #
+ 
++#=============================================================================
++# Copyright 2001-2009 Kitware, Inc.
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is distributed WITHOUT ANY WARRANTY; without even the
++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++# See the License for more information.
++#=============================================================================
++# (To distributed this file outside of CMake, substitute the full
++#  License text for the above reference.)
++
+ # Construct consitent error messages for use below.
+ SET(VTK_DIR_DESCRIPTION "directory containing VTKConfig.cmake.  This is either the root of the build tree, or PREFIX/lib/vtk for an installation.  For VTK 4.0, this is the location of UseVTK.cmake.  This is either the root of the build tree or PREFIX/include/vtk for an installation.")
+ SET(VTK_DIR_MESSAGE "VTK not found.  Set the VTK_DIR cmake cache entry to the ${VTK_DIR_DESCRIPTION}")
+@@ -45,6 +58,7 @@
+   SET(VTK_DIR_SEARCH "")
+   FOREACH(dir ${VTK_DIR_SEARCH2})
+     SET(VTK_DIR_SEARCH ${VTK_DIR_SEARCH}
++      ${dir}/../lib/vtk-5.4
+       ${dir}/../lib/vtk-5.2
+       ${dir}/../lib/vtk-5.1
+       ${dir}/../lib/vtk-5.0
diff --git a/debian/patches/series b/debian/patches/series
index f1bf47541..6d5b92c0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ manpage_friendly_docs.diff
 fix_bashisms.diff
 FindPerlLibs.cmake-perl-5.10.diff
 FindJNI.cmake-more-arches.diff
+FindVTK.cmake-vtk-5.4.diff