diff --git a/doc/source/conf.py b/doc/source/conf.py
index 23824d8..aa2c708 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -30,6 +30,7 @@ openstackdocs_repo_name = 'openstack/os-performance-tools'
 openstackdocs_auto_name = False
 openstackdocs_bug_project = 'os-performance-tools'
 openstackdocs_bug_tag = ''
+openstackdocs_pdf_link = True
 
 html_theme = 'openstackdocs'
 
@@ -82,10 +83,16 @@ htmlhelp_basename = '%sdoc' % project
 # [howto/manual]).
 latex_documents = [
     ('index',
-     '%s.tex' % project,
-     u'%s Documentation' % project,
+     'doc-%s.tex' % project,
+     u'Os-performance-tools Documentation',
      u'OpenStack Foundation', 'manual'),
 ]
 
 # Example configuration for intersphinx: refer to the Python standard library.
 #intersphinx_mapping = {'http://docs.python.org/': None}
+
+latex_use_xindy = False
+latex_elements = {
+    'extraclassoptions': 'openany,oneside',
+    'maxlistdepth': 10
+}
diff --git a/tox.ini b/tox.ini
index b23a43a..55124b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,6 +28,14 @@ deps =
 commands =
   sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
 
+[testenv:pdf-docs]
+deps = {[testenv:docs]deps}
+whitelist_externals =
+   make
+commands =
+   sphinx-build -W -b latex doc/source doc/build/pdf
+   make -C doc/build/pdf
+
 [testenv:debug]
 commands = oslo_debug_helper {posargs}