diff --git a/debian/control.lenny b/debian/control.lenny
index 6ba8e56f2b5..b5258ec8cf9 100644
--- a/debian/control.lenny
+++ b/debian/control.lenny
@@ -27,7 +27,8 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0),
  sip4 (>= 4.5),
- subversion
+ subversion,
+ txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
diff --git a/debian/control.lucid b/debian/control.lucid
index c2cd6b82577..ca8dcea7660 100644
--- a/debian/control.lucid
+++ b/debian/control.lucid
@@ -28,7 +28,8 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion
+ subversion,
+ txt2tags 
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
diff --git a/debian/control.maverick b/debian/control.maverick
index c2c57f1b734..879d01d7bc8 100644
--- a/debian/control.maverick
+++ b/debian/control.maverick
@@ -29,7 +29,8 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion
+ subversion,
+ txt2tags 
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
diff --git a/debian/control.natty b/debian/control.natty
index c2c57f1b734..2a650d12f5b 100644
--- a/debian/control.natty
+++ b/debian/control.natty
@@ -29,7 +29,8 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion
+ subversion,
+ txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
diff --git a/debian/control.sid b/debian/control.sid
index 9a14ed145ba..578df781c08 100644
--- a/debian/control.sid
+++ b/debian/control.sid
@@ -28,7 +28,9 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion
+ subversion,
+ doxygen,
+ txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -173,3 +175,11 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
+Package: qgis-apidoc
+Architecture: all
+Description: Quantum GIS API documentation
+ Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
+ and display databases of geographic information.
+ .
+ This package contains the Quantum GIS API documentation.
+
diff --git a/debian/control.squeeze b/debian/control.squeeze
index c2cd6b82577..ca8dcea7660 100644
--- a/debian/control.squeeze
+++ b/debian/control.squeeze
@@ -28,7 +28,8 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion
+ subversion,
+ txt2tags 
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 5442c182369..00000000000
--- a/debian/docs
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTHORS
-BUGS
-README
-TODO
diff --git a/debian/qgis-apidoc.dirs b/debian/qgis-apidoc.dirs
new file mode 100644
index 00000000000..d13addab49a
--- /dev/null
+++ b/debian/qgis-apidoc.dirs
@@ -0,0 +1 @@
+usr/share/qgis/doc/api
diff --git a/debian/qgis-common.install b/debian/qgis-common.install
index 565fa794815..77327d39a42 100644
--- a/debian/qgis-common.install
+++ b/debian/qgis-common.install
@@ -7,6 +7,11 @@ usr/share/qgis/doc/SPONSORS
 usr/share/qgis/doc/CONTRIBUTORS
 usr/share/qgis/doc/TRANSLATORS
 usr/share/qgis/doc/DONORS
+usr/share/qgis/doc/AUTHORS.html
+usr/share/qgis/doc/SPONSORS.html
+usr/share/qgis/doc/CONTRIBUTORS.html
+usr/share/qgis/doc/TRANSLATORS.html
+usr/share/qgis/doc/DONORS.html
 usr/share/qgis/doc/images
 usr/share/qgis/i18n/*
 usr/share/qgis/images/*
diff --git a/debian/rules b/debian/rules
index 903bdb1ae8e..330af1d2372 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,10 @@ CMAKE_OPTS := \
 	-D WITH_MAPSERVER=TRUE \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin
 
+ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+	CMAKE_OPTS += -D WITH_APIDOC=TRUE
+endif
+
 ifneq (,$(findstring $(DISTRIBUTION),"natty"))
 	CMAKE_OPTS += -D QT_QTWEBKIT_INCLUDE_DIR=/usr/include/QtWebKit
 endif