diff --git a/debian/control b/debian/control
index b6bc16a..0590547 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  python-sphinx,
  python-coverage,
  python3-coverage,
- locales-all,
+ locales-all
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.4
@@ -26,6 +26,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/kitchen.git
 Package: python-kitchen
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Suggests: python-kitchen-doc
 Description: Python library of containers, text and i18n helpers (Python 2)
  The kitchen Python package aims at gathering in one place all the snippets of
  code that the author originally carried around from project to project to ease
@@ -42,6 +43,7 @@ Description: Python library of containers, text and i18n helpers (Python 2)
 Package: python3-kitchen
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
+Suggests: python-kitchen-doc
 Description: Python library of containers, text and i18n helpers (Python 3)
  The kitchen Python package aims at gathering in one place all the snippets of
  code that the author originally carried around from project to project to ease
@@ -54,3 +56,20 @@ Description: Python library of containers, text and i18n helpers (Python 3)
    * Tools to help deal with PEP386 version format
  .
  This package installs the library for Python 3.
+
+Package: python-kitchen-doc
+Architecture: all
+Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Description: Python library of containers, text and i18n helpers (common documentation)
+ The kitchen Python package aims at gathering in one place all the snippets of
+ code that the author originally carried around from project to project to ease
+ the development.
+ .
+ A non-exhaustive list of the features provided by kitchen:
+   * helpers for text and specifically unicode handling i18n support
+   * a dictionary that treats unicode and str strings as different values
+   * An helper function to change any non-list value into a single-element list
+   * Tools to help deal with PEP386 version format
+ .
+ This is the common documentation package.
diff --git a/debian/python-kitchen-doc.doc-base b/debian/python-kitchen-doc.doc-base
new file mode 100644
index 0000000..6e35d1f
--- /dev/null
+++ b/debian/python-kitchen-doc.doc-base
@@ -0,0 +1,21 @@
+Document: kitchen
+Title: Debian kitchen Manual
+Author: Toshio Kuratomi
+Abstract: This is the manual for kitchen.
+ kitchen is a Python plugin that aims at gathering in one place all
+ the snippets of code that the author originally carried around from
+ project to project to ease the development.
+ .
+ A non-exhaustive list of the features provided by kitchen:
+ * helpers for text and specifically unicode handling i18n support
+ * a dictionary that treats unicode and str strings as different values
+ * An helper function to change any non-list value into a single-element list
+ * Tools to help deal with PEP386 version format
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-kitchen-doc/html/index.html
+Files:
+ /usr/share/doc/python-kitchen-doc/html/*.html
+ /usr/share/doc/python-kitchen-doc/html/_sources/*
+ /usr/share/doc/python-kitchen-doc/html/_static/*
diff --git a/debian/python-kitchen-doc.docs b/debian/python-kitchen-doc.docs
new file mode 100644
index 0000000..82ca551
--- /dev/null
+++ b/debian/python-kitchen-doc.docs
@@ -0,0 +1,2 @@
+kitchen2/docs/_build/html/
+NEWS.rst
diff --git a/debian/python-kitchen-doc.manpages b/debian/python-kitchen-doc.manpages
new file mode 100644
index 0000000..edf11c9
--- /dev/null
+++ b/debian/python-kitchen-doc.manpages
@@ -0,0 +1 @@
+kitchen2/docs/_build/man/kitchen.1
diff --git a/debian/rules b/debian/rules
index 5718779..ee2713e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,12 @@ export LANGUAGE =
 
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_auto_build:
+	dh_auto_build
+# Docs from kitchen2 and kitchen3 are basically the same, so we just
+# use the ones from kitchen2.
+	PYTHONPATH=$(CURDIR)/kitchen2/ http_proxy='127.0.0.1:9' \
+		sphinx-build -N -bhtml kitchen2/docs/ kitchen2/docs/_build/html
+	PYTHONPATH=$(CURDIR)/kitchen2/ http_proxy='127.0.0.1:9' \
+		sphinx-build -N -bman kitchen2/docs/ kitchen2/docs/_build/man