diff --git a/debian/changelog b/debian/changelog
index 205d26c6e..a8fa36f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ cmake (2.8.3-2) UNRELEASED; urgency=low
   * debian/patches/FindTCL_fix_#600245.diff: Added. (Closes: #600245)
 
   [ Modestas Vainius ]
-  * Install cmake documentation into /usr/share/doc/cmake-doc/ (LP: #669197).
+  * Install cmake documentation into /usr/share/doc/cmake/ and link doc
+    directories of the rest binary packages to it (needs debhelper 7.4.2).
+    (LP: #669197)
 
  -- Kai Wasserbäch <debian@carbon-project.org>  Fri, 27 Nov 2010 10:41:10 +0100
 
diff --git a/debian/cmake-doc.doc-base.ccmake b/debian/cmake-doc.doc-base.ccmake
index efdb49cb0..611322e73 100644
--- a/debian/cmake-doc.doc-base.ccmake
+++ b/debian/cmake-doc.doc-base.ccmake
@@ -3,8 +3,8 @@ Title: Reference of curses based interface of CMake.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/ccmake.html
-Files: /usr/share/doc/cmake-doc/ccmake.html
+Index: /usr/share/doc/cmake/ccmake.html
+Files: /usr/share/doc/cmake/ccmake.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/ccmake.txt.gz
+Files: /usr/share/doc/cmake/ccmake.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake b/debian/cmake-doc.doc-base.cmake
index 03a7a22d9..a1a218671 100644
--- a/debian/cmake-doc.doc-base.cmake
+++ b/debian/cmake-doc.doc-base.cmake
@@ -3,8 +3,8 @@ Title: Reference of CMake the Cross-Platform Makefile Generator.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake.html
-Files: /usr/share/doc/cmake-doc/cmake.html
+Index: /usr/share/doc/cmake/cmake.html
+Files: /usr/share/doc/cmake/cmake.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake.txt.gz
+Files: /usr/share/doc/cmake/cmake.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-commands b/debian/cmake-doc.doc-base.cmake-commands
index 45d976854..eb5bba8c0 100644
--- a/debian/cmake-doc.doc-base.cmake-commands
+++ b/debian/cmake-doc.doc-base.cmake-commands
@@ -3,8 +3,8 @@ Title: Command reference of CMake
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-commands.html
-Files: /usr/share/doc/cmake-doc/cmake-commands.html
+Index: /usr/share/doc/cmake/cmake-commands.html
+Files: /usr/share/doc/cmake/cmake-commands.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-commands.txt.gz
+Files: /usr/share/doc/cmake/cmake-commands.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-compatcommands b/debian/cmake-doc.doc-base.cmake-compatcommands
index 7025c1b74..bf863d25a 100644
--- a/debian/cmake-doc.doc-base.cmake-compatcommands
+++ b/debian/cmake-doc.doc-base.cmake-compatcommands
@@ -3,8 +3,8 @@ Title: Reference of CMake compatibility commands
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-compatcommands.html
-Files: /usr/share/doc/cmake-doc/cmake-compatcommands.html
+Index: /usr/share/doc/cmake/cmake-compatcommands.html
+Files: /usr/share/doc/cmake/cmake-compatcommands.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-compatcommands.txt.gz
+Files: /usr/share/doc/cmake/cmake-compatcommands.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-gui b/debian/cmake-doc.doc-base.cmake-gui
index 7fb086d37..96d5a8484 100644
--- a/debian/cmake-doc.doc-base.cmake-gui
+++ b/debian/cmake-doc.doc-base.cmake-gui
@@ -3,8 +3,8 @@ Title: Documentation of the Qt GUI for CMake
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-gui.html
-Files: /usr/share/doc/cmake-doc/cmake-gui.html
+Index: /usr/share/doc/cmake/cmake-gui.html
+Files: /usr/share/doc/cmake/cmake-gui.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-gui.txt.gz
+Files: /usr/share/doc/cmake/cmake-gui.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-modules b/debian/cmake-doc.doc-base.cmake-modules
index 22be15a49..8aef87368 100644
--- a/debian/cmake-doc.doc-base.cmake-modules
+++ b/debian/cmake-doc.doc-base.cmake-modules
@@ -3,8 +3,8 @@ Title: Reference of available CMake modules
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-modules.html
-Files: /usr/share/doc/cmake-doc/cmake-modules.html
+Index: /usr/share/doc/cmake/cmake-modules.html
+Files: /usr/share/doc/cmake/cmake-modules.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-modules.txt.gz
+Files: /usr/share/doc/cmake/cmake-modules.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-policies b/debian/cmake-doc.doc-base.cmake-policies
index e76fb0776..055ecbb0f 100644
--- a/debian/cmake-doc.doc-base.cmake-policies
+++ b/debian/cmake-doc.doc-base.cmake-policies
@@ -3,8 +3,8 @@ Title: Reference of CMake policies.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-policies.html
-Files: /usr/share/doc/cmake-doc/cmake-policies.html
+Index: /usr/share/doc/cmake/cmake-policies.html
+Files: /usr/share/doc/cmake/cmake-policies.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-policies.txt.gz
+Files: /usr/share/doc/cmake/cmake-policies.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-properties b/debian/cmake-doc.doc-base.cmake-properties
index 681aae3b7..d47821e73 100644
--- a/debian/cmake-doc.doc-base.cmake-properties
+++ b/debian/cmake-doc.doc-base.cmake-properties
@@ -3,8 +3,8 @@ Title: Reference of CMake properties.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-properties.html
-Files: /usr/share/doc/cmake-doc/cmake-properties.html
+Index: /usr/share/doc/cmake/cmake-properties.html
+Files: /usr/share/doc/cmake/cmake-properties.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-properties.txt.gz
+Files: /usr/share/doc/cmake/cmake-properties.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-variables b/debian/cmake-doc.doc-base.cmake-variables
index 00b2f3b03..06f2f077c 100644
--- a/debian/cmake-doc.doc-base.cmake-variables
+++ b/debian/cmake-doc.doc-base.cmake-variables
@@ -3,8 +3,8 @@ Title: Reference of CMake variables.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cmake-variables.html
-Files: /usr/share/doc/cmake-doc/cmake-variables.html
+Index: /usr/share/doc/cmake/cmake-variables.html
+Files: /usr/share/doc/cmake/cmake-variables.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cmake-variables.txt.gz
+Files: /usr/share/doc/cmake/cmake-variables.txt.gz
diff --git a/debian/cmake-doc.doc-base.cpack b/debian/cmake-doc.doc-base.cpack
index 59816f263..8ac0d80da 100644
--- a/debian/cmake-doc.doc-base.cpack
+++ b/debian/cmake-doc.doc-base.cpack
@@ -3,8 +3,8 @@ Title: Reference of the packaging driver provided by CMake.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/cpack.html
-Files: /usr/share/doc/cmake-doc/cpack.html
+Index: /usr/share/doc/cmake/cpack.html
+Files: /usr/share/doc/cmake/cpack.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/cpack.txt.gz
+Files: /usr/share/doc/cmake/cpack.txt.gz
diff --git a/debian/cmake-doc.doc-base.ctest b/debian/cmake-doc.doc-base.ctest
index cfb1965ff..283e0df83 100644
--- a/debian/cmake-doc.doc-base.ctest
+++ b/debian/cmake-doc.doc-base.ctest
@@ -3,8 +3,8 @@ Title: Reference of the testing driver provided by CMake.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/cmake-doc/ctest.html
-Files: /usr/share/doc/cmake-doc/ctest.html
+Index: /usr/share/doc/cmake/ctest.html
+Files: /usr/share/doc/cmake/ctest.html
 
 Format: Text
-Files: /usr/share/doc/cmake-doc/ctest.txt.gz
+Files: /usr/share/doc/cmake/ctest.txt.gz
diff --git a/debian/cmake-doc.install b/debian/cmake-doc.install
index 8ad70ceac..ce0cbe1b5 100644
--- a/debian/cmake-doc.install
+++ b/debian/cmake-doc.install
@@ -1,3 +1,3 @@
-usr/share/doc/cmake/*.html usr/share/doc/cmake-doc/
-usr/share/doc/cmake/*.txt usr/share/doc/cmake-doc/
-usr/share/doc/cmake/*.docbook usr/share/doc/cmake-doc/
+usr/share/doc/cmake/*.html usr/share/doc/cmake/
+usr/share/doc/cmake/*.txt usr/share/doc/cmake/
+usr/share/doc/cmake/*.docbook usr/share/doc/cmake/
diff --git a/debian/control b/debian/control
index 2528b111c..946468c33 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Modestas Vainius <modax@debian.org>
 Uploaders: A. Maitland Bottoms <bottoms@debian.org>, Kai Wasserbäch <debian@carbon-project.org>
-Build-Depends: debhelper (>= 7.3), libcurl4-gnutls-dev, libxmlrpc-c3-dev, libexpat1-dev, zlib1g-dev,
+Build-Depends: debhelper (>= 7.4.2), libcurl4-gnutls-dev, libxmlrpc-c3-dev, libexpat1-dev, zlib1g-dev,
  libncurses5-dev, libqt4-dev (>= 4.4.0), procps [!hurd-any], libarchive-dev (>= 2.8.0)
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/collab-maint/cmake.git
diff --git a/debian/rules b/debian/rules
index 1d1ec08a1..fca1bd475 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,9 @@ override_dh_auto_clean:
 	dh_auto_clean
 	rm -f $(BUILD_FLAGS_FILE)
 
+override_dh_installdocs:
+	dh_installdocs --link-doc=cmake
+
 %:
 	dh --parallel --builddirectory=Build --dbg-package=cmake-dbg $@