diff -Nru openstack-doc-tools-1.6.0/debian/changelog openstack-doc-tools-1.6.0/debian/changelog
--- openstack-doc-tools-1.6.0/debian/changelog	2017-11-01 23:29:43.000000000 +0000
+++ openstack-doc-tools-1.6.0/debian/changelog	2018-07-17 15:47:20.000000000 +0000
@@ -1,3 +1,14 @@
+openstack-doc-tools (1.6.0-3) unstable; urgency=medium
+
+  [ Michal Arbet ]
+  * Team upload.
+  * Add fix-man-pages-generation.patch (Closes: #903185).
+
+  [ Ondřej Nový ]
+  * d/control: Set Vcs-* to salsa.debian.org
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 17 Jul 2018 15:47:20 +0000
+
 openstack-doc-tools (1.6.0-2) unstable; urgency=medium
 
   * (build-)depends on python-openstackdocstheme (Closes: #880130).
diff -Nru openstack-doc-tools-1.6.0/debian/control openstack-doc-tools-1.6.0/debian/control
--- openstack-doc-tools-1.6.0/debian/control	2017-11-01 23:29:43.000000000 +0000
+++ openstack-doc-tools-1.6.0/debian/control	2018-07-17 15:47:20.000000000 +0000
@@ -32,8 +32,8 @@
  python-yaml,
 Standards-Version: 4.1.1
 Homepage: https://github.com/openstack/openstack-doc-tools
-Vcs-Git: https://anonscm.debian.org/git/openstack/libs/openstack-doc-tools.git
-Vcs-Browser: https://anonscm.debian.org/cgit/openstack/libs/openstack-doc-tools.git
+Vcs-Git: https://salsa.debian.org/openstack-team/libs/openstack-doc-tools.git
+Vcs-Browser: https://salsa.debian.org/openstack-team/libs/openstack-doc-tools
 
 Package: openstack-doc-tools-common
 Architecture: all
diff -Nru openstack-doc-tools-1.6.0/debian/patches/fix-man-pages-generation.patch openstack-doc-tools-1.6.0/debian/patches/fix-man-pages-generation.patch
--- openstack-doc-tools-1.6.0/debian/patches/fix-man-pages-generation.patch	1970-01-01 00:00:00.000000000 +0000
+++ openstack-doc-tools-1.6.0/debian/patches/fix-man-pages-generation.patch	2018-07-17 15:47:20.000000000 +0000
@@ -0,0 +1,23 @@
+Description: Fix man pages generation
+Author: Michal Arbet <michal.arbet@ultimum.io>
+Debian-Bug: https://bugs.debian.org/903185
+Last-Update: 2018-01-24
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index bf91c79..b73ba24 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -88,7 +88,12 @@ latex_documents = [
+ 
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+-man_pages = []
++man_pages = [
++    ('man/openstack-doc-test', 'openstack-doc-test',
++     u'OpenStack documentation tools',
++     [u'OpenStack'], 1)
++]
++
+ 
+ # If true, show URL addresses after external links.
+ # man_show_urls = False
diff -Nru openstack-doc-tools-1.6.0/debian/patches/series openstack-doc-tools-1.6.0/debian/patches/series
--- openstack-doc-tools-1.6.0/debian/patches/series	2017-11-01 23:29:43.000000000 +0000
+++ openstack-doc-tools-1.6.0/debian/patches/series	2018-07-17 15:47:20.000000000 +0000
@@ -1 +1,2 @@
 remove-cliff-tablib-from-requirements.txt
+fix-man-pages-generation.patch