diff --git a/debian/changelog b/debian/changelog
index ef0d7ec5c..e114bee95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ cmake (2.6.4-3) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.8.3, no changes needed.
   * Add ${misc:Depends} to Depends fields of packages.
+  * Improve debian/watch:
+    - make it scan remote directories recursively;
+    - make it work with new upstream RC release mangling.
 
  -- Modestas Vainius <modestas@vainius.eu>  Fri, 21 Aug 2009 21:48:12 +0300
 
diff --git a/debian/watch b/debian/watch
index 81fc3a05e..94635edbb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
 version=3
 
 # Track CMake 2.6.x releases including RCs
-opts="uversionmangle=s/-RC-(\d+)/~rc$1/i" \
-    http://www.cmake.org/files/v2.6/cmake-([\d.]+(?:-RC-\d+)?).tar.gz
+opts="uversionmangle=s/-[Rr][Cc]-?(\d+)/~rc$1/i" \
+    http://www.cmake.org/files/v([\d.]+)/ \
+    cmake-([\d.]+(?i:-RC-?\d+)?).tar.gz