diff --git a/debian/changelog b/debian/changelog
index 68bcdeb2..8343c750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 python-taskflow (1.17.0-3) experimental; urgency=medium
 
   * Added Python3 support (Closes: #798018).
+  * Added a -doc package.
 
  -- Thomas Goirand <zigo@debian.org>  Sat, 12 Sep 2015 07:56:16 +0000
 
diff --git a/debian/control b/debian/control
index 11d65f7d..21bbd454 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,9 @@ Build-Depends: debhelper (>= 9),
                python-pbr (>= 1.3),
                python-setuptools,
                python-sphinx,
+               python3-all,
+               python3-pbr (>= 1.3),
+               python3-setuptools,
 Build-Depends-Indep: alembic (>= 0.7.2),
                      python-alembic,
                      python-automaton,
@@ -147,3 +150,16 @@ Description: Taskflow structured state management library - Python 3.x
  More information at http://wiki.openstack.org/wiki/TaskFlow
  .
  This package contains the Python 3.x module.
+
+Package: python-taskflow-doc
+Section: doc
+Architecture: all
+Depends: ${sphinxdoc:Depends},
+         ${misc:Depends},
+Description: Taskflow structured state management library - doc
+ TaskFlow, is a library to do [jobs, tasks, flows] in a HA manner
+ using different backends to be used with OpenStack projects.
+ More information at http://wiki.openstack.org/wiki/TaskFlow
+ .
+ This package contains the documentation.
+
diff --git a/debian/python-taskflow-doc.doc-base b/debian/python-taskflow-doc.doc-base
new file mode 100644
index 00000000..fc3cd5a9
--- /dev/null
+++ b/debian/python-taskflow-doc.doc-base
@@ -0,0 +1,9 @@
+Document: python-taskflow-doc
+Title: Taskflow Documentation
+Author: OpenStack
+Abstract: Sphinx documentation for Taskflow
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-taskflow-doc/html/index.html
+Files: /usr/share/doc/python-taskflow-doc/html/*
diff --git a/debian/rules b/debian/rules
index a5132866..8494f443 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
 %:
-	dh $@ --buildsystem=python_distutils --with python2,python3
+	dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
 
 override_dh_install:
 	set -e ; for pyvers in $(PYTHONS); do \
@@ -41,3 +41,19 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 		testr-python$$PYMAJOR slowest ; \
 	done
 endif
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -b html doc/source debian/python-taskflow-doc/usr/share/doc/python-taskflow-doc/html
+	dh_sphinxdoc -O--buildsystem=python_distutils
+endif
+
+# Commands not to run
+override_dh_installcatalogs:
+override_dh_installemacsen override_dh_installifupdown:
+override_dh_installinfo override_dh_installmenu override_dh_installmime:
+override_dh_installmodules override_dh_installlogcheck:
+override_dh_installpam override_dh_installppp override_dh_installudev override_dh_installwm:
+override_dh_installxfonts override_dh_gconf override_dh_icons override_dh_perl override_dh_usrlocal:
+override_dh_installcron override_dh_installdebconf:
+override_dh_installlogrotate override_dh_installgsettings: