diff --git a/doc/requirements.txt b/doc/requirements.txt
index 0358b58e6bcb635675aaee4d76267fe1a4c4f7be..47988d658727163ee3c4dfbfb9b07d408d792455 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -9,3 +9,4 @@ openstackdocstheme>=1.19.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
 sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
+sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f30ac88ea7bcd6bb4a59dabd6a395ef8044e8618..e5dd3f98eac30be9ec70e89e77940da2c07e221a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,6 +24,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'openstackdocstheme',
     'sphinx.ext.autodoc',
+    'sphinxcontrib.rsvgconverter',
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
@@ -79,11 +80,14 @@ html_last_updated_fmt = '%Y-%m-%d %H:%M'
 # [howto/manual]).
 latex_documents = [
     ('index',
-     '%s.tex' % project,
+     'doc-%s.tex' % project,
      u'%s Documentation' % project,
      u'OpenStack Foundation', 'manual'),
 ]
 
+# Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
+latex_use_xindy = False
+
 # openstackdocstheme options
 repository_name = 'openstack/kolla-ansible'
 bug_project = 'kolla-ansible'
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9c0bf53bef2a66b0e4366bc2c02871bd644cb5b2..3ce8c19b3b9a308e0fa74335dc2ee5f174467cce 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -91,6 +91,7 @@ smmap2==2.0.3
 snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
+sphinxcontrib-svg2pdfconverter==0.1.0
 stevedore==1.28.0
 stestr==2.0.0
 testscenarios==0.4
diff --git a/tox.ini b/tox.ini
index 89a643db427c81c5c0704fda8a70894c036de8cf..44d058460512b06e27779621c3c96fafda01363e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,6 +86,14 @@ commands =
   rm -rf deploy-guide/build
   sphinx-build -a -E -W -d deploy-guide/build/doctrees -b html deploy-guide/source deploy-guide/build/html
 
+[testenv:pdf-docs]
+basepython = python3
+whitelist_externals = make
+deps = {[testenv:docs]deps}
+commands =
+  sphinx-build -W -b latex doc/source doc/build/pdf
+  make -C doc/build/pdf
+
 [testenv:setupenv]
 basepython = python3
 commands =