diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5808935..901d195 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,6 +33,7 @@ extensions = ['sphinx.ext.autodoc',
               'sphinx.ext.todo',
               'sphinx.ext.viewcode',
               'openstackdocstheme',
+              'sphinxcontrib.rsvgconverter',
              ]
 
 # Feed configuration for yasfb
@@ -179,22 +180,22 @@ htmlhelp_basename = 'Cloudkitty-Specsdoc'
 
 # -- Options for LaTeX output --------------------------------------------------
 
+# Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
+latex_use_xindy = False
+
+latex_domain_indices = False
+
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    'makeindex': '',
+    'printindex': '',
+    'preamble': r'\setcounter{tocdepth}{3}',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'Cloudkitty-specs.tex', u'Cloudkitty Specs',
-   u'OpenStack Cloudkitty Team', 'manual'),
+    ('index', 'doc-cloudkitty-specs.tex', u'Cloudkitty Specs',
+     u'OpenStack Cloudkitty Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/requirements.txt b/requirements.txt
index a0500c7..0e38b48 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@ sphinx>=1.6.2
 testrepository>=0.0.18
 testtools>=0.9.34
 openstackdocstheme>=1.17.0 # Apache-2.0
+sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
diff --git a/tox.ini b/tox.ini
index 626792a..03066fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,3 +16,12 @@ commands = {posargs}
 [testenv:docs]
 basepython = python3
 commands = python setup.py build_sphinx
+
+[testenv:pdf-docs]
+basepython = python3
+envdir = {toxworkdir}/docs
+whitelist_externals =
+  make
+commands =
+  sphinx-build -b latex doc/source doc/build/pdf
+  make -C doc/build/pdf