diff --git a/debian/changelog b/debian/changelog
index 9c4d35a95..2b12bb554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 cmake (2.8.3-3) UNRELEASED; urgency=low
 
+  * Install documentation to /usr/share/cmake-data instead as it's the "base"
+    package rather than cmake. Also link doc directories to it.
 
  -- Modestas Vainius <modax@debian.org>  Sun, 02 Jan 2011 13:29:09 +0200
 
diff --git a/debian/cmake-doc.doc-base.ccmake b/debian/cmake-doc.doc-base.ccmake
index 611322e73..dd382b509 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/ccmake.html
-Files: /usr/share/doc/cmake/ccmake.html
+Index: /usr/share/doc/cmake-data/ccmake.html
+Files: /usr/share/doc/cmake-data/ccmake.html
 
 Format: Text
-Files: /usr/share/doc/cmake/ccmake.txt.gz
+Files: /usr/share/doc/cmake-data/ccmake.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake b/debian/cmake-doc.doc-base.cmake
index a1a218671..6fb07bc56 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/cmake.html
-Files: /usr/share/doc/cmake/cmake.html
+Index: /usr/share/doc/cmake-data/cmake.html
+Files: /usr/share/doc/cmake-data/cmake.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake.txt.gz
+Files: /usr/share/doc/cmake-data/cmake.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-commands b/debian/cmake-doc.doc-base.cmake-commands
index eb5bba8c0..0819901c8 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/cmake-commands.html
-Files: /usr/share/doc/cmake/cmake-commands.html
+Index: /usr/share/doc/cmake-data/cmake-commands.html
+Files: /usr/share/doc/cmake-data/cmake-commands.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-commands.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-commands.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-compatcommands b/debian/cmake-doc.doc-base.cmake-compatcommands
index bf863d25a..6d5adcfd8 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/cmake-compatcommands.html
-Files: /usr/share/doc/cmake/cmake-compatcommands.html
+Index: /usr/share/doc/cmake-data/cmake-compatcommands.html
+Files: /usr/share/doc/cmake-data/cmake-compatcommands.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-compatcommands.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-compatcommands.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-gui b/debian/cmake-doc.doc-base.cmake-gui
index 96d5a8484..7ac2f8261 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/cmake-gui.html
-Files: /usr/share/doc/cmake/cmake-gui.html
+Index: /usr/share/doc/cmake-data/cmake-gui.html
+Files: /usr/share/doc/cmake-data/cmake-gui.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-gui.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-gui.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-modules b/debian/cmake-doc.doc-base.cmake-modules
index 8aef87368..5b7bf035c 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/cmake-modules.html
-Files: /usr/share/doc/cmake/cmake-modules.html
+Index: /usr/share/doc/cmake-data/cmake-modules.html
+Files: /usr/share/doc/cmake-data/cmake-modules.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-modules.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-modules.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-policies b/debian/cmake-doc.doc-base.cmake-policies
index 055ecbb0f..31c882f17 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/cmake-policies.html
-Files: /usr/share/doc/cmake/cmake-policies.html
+Index: /usr/share/doc/cmake-data/cmake-policies.html
+Files: /usr/share/doc/cmake-data/cmake-policies.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-policies.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-policies.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-properties b/debian/cmake-doc.doc-base.cmake-properties
index d47821e73..d72cb72f3 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/cmake-properties.html
-Files: /usr/share/doc/cmake/cmake-properties.html
+Index: /usr/share/doc/cmake-data/cmake-properties.html
+Files: /usr/share/doc/cmake-data/cmake-properties.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-properties.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-properties.txt.gz
diff --git a/debian/cmake-doc.doc-base.cmake-variables b/debian/cmake-doc.doc-base.cmake-variables
index 06f2f077c..d36e80bd4 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/cmake-variables.html
-Files: /usr/share/doc/cmake/cmake-variables.html
+Index: /usr/share/doc/cmake-data/cmake-variables.html
+Files: /usr/share/doc/cmake-data/cmake-variables.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cmake-variables.txt.gz
+Files: /usr/share/doc/cmake-data/cmake-variables.txt.gz
diff --git a/debian/cmake-doc.doc-base.cpack b/debian/cmake-doc.doc-base.cpack
index 8ac0d80da..36a6f13a3 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/cpack.html
-Files: /usr/share/doc/cmake/cpack.html
+Index: /usr/share/doc/cmake-data/cpack.html
+Files: /usr/share/doc/cmake-data/cpack.html
 
 Format: Text
-Files: /usr/share/doc/cmake/cpack.txt.gz
+Files: /usr/share/doc/cmake-data/cpack.txt.gz
diff --git a/debian/cmake-doc.doc-base.ctest b/debian/cmake-doc.doc-base.ctest
index 283e0df83..bd8f1b347 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/ctest.html
-Files: /usr/share/doc/cmake/ctest.html
+Index: /usr/share/doc/cmake-data/ctest.html
+Files: /usr/share/doc/cmake-data/ctest.html
 
 Format: Text
-Files: /usr/share/doc/cmake/ctest.txt.gz
+Files: /usr/share/doc/cmake-data/ctest.txt.gz
diff --git a/debian/cmake-doc.install b/debian/cmake-doc.install
index ce0cbe1b5..2fb1a3ab6 100644
--- a/debian/cmake-doc.install
+++ b/debian/cmake-doc.install
@@ -1,3 +1,3 @@
-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/
+usr/share/doc/cmake/*.html usr/share/doc/cmake-data/
+usr/share/doc/cmake/*.txt usr/share/doc/cmake-data/
+usr/share/doc/cmake/*.docbook usr/share/doc/cmake-data/
diff --git a/debian/rules b/debian/rules
index fca1bd475..8d0ac0f61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ override_dh_auto_clean:
 	rm -f $(BUILD_FLAGS_FILE)
 
 override_dh_installdocs:
-	dh_installdocs --link-doc=cmake
+	dh_installdocs --link-doc=cmake-data
 
 %:
 	dh --parallel --builddirectory=Build --dbg-package=cmake-dbg $@