diff --git a/debian/changelog b/debian/changelog
index 29a679c6d..92868c2e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ cmake (2.8.3-2) UNRELEASED; urgency=low
   * debian/source/local-options: Added "unapply-patches".
   * debian/watch: Added git-import-orig invocation.
   * debian/gbp.conf: Added, to ensure we use pristine-tar.
+  * debian/patches/FindTCL_fix_#600245.diff: Added. (Closes: #600245)
 
- -- Modestas Vainius <modax@debian.org>  Fri, 26 Nov 2010 19:36:44 +0200
+ -- Kai Wasserbäch <debian@carbon-project.org>  Fri, 27 Nov 2010 10:41:10 +0100
 
 cmake (2.8.3-1) experimental; urgency=low
 
diff --git a/debian/patches/FindTCL_fix_#600245.diff b/debian/patches/FindTCL_fix_#600245.diff
new file mode 100644
index 000000000..371697b57
--- /dev/null
+++ b/debian/patches/FindTCL_fix_#600245.diff
@@ -0,0 +1,30 @@
+From: Kai Wasserbäch <debian@carbon-project.org>
+Description: FindTCL.cmake switches variables in the FIND_LIBRARY invocation.
+ The FIND_LIBRARY() statement for TCL used the TK variables and vice versa.
+ This patch reverses that into the right usage. (Closes: #600245)
+Last-Update: 2010-11-27
+Origin: vendor
+---
+ Modules/FindTCL.cmake |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Modules/FindTCL.cmake
++++ b/Modules/FindTCL.cmake
+@@ -104,7 +104,7 @@ ENDIF(WIN32)
+ FIND_LIBRARY(TCL_LIBRARY
+   NAMES 
+   tcl   
+-  tcl${TK_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
++  tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
+   tcl86 tcl8.6 
+   tcl85 tcl8.5 
+   tcl84 tcl8.4 
+@@ -117,7 +117,7 @@ FIND_LIBRARY(TCL_LIBRARY
+ FIND_LIBRARY(TK_LIBRARY 
+   NAMES 
+   tk
+-  tk${TCL_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
++  tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
+   tk86 tk8.6
+   tk85 tk8.5 
+   tk84 tk8.4 
diff --git a/debian/patches/series b/debian/patches/series
index 086169b1c..773d8cfcb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 FindPython_fix_#569321_and_#580503.diff
 fixup_manpages.diff
+FindTCL_fix_#600245.diff