diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1465cd4..110e8b4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,7 +37,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'tempest_stress'
+project = u'tempest-stress'
 copyright = u'2016, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -55,6 +55,7 @@ openstackdocs_repo_name = 'openstack/tempest-stress'
 openstackdocs_auto_name = False
 openstackdocs_bug_project = 'tempest'
 openstackdocs_bug_tag = 'doc'
+openstackdocs_pdf_link = True
 
 # -- Options for HTML output --------------------------------------------------
 
@@ -74,10 +75,15 @@ htmlhelp_basename = '%sdoc' % project
 # [howto/manual]).
 latex_documents = [
     ('index',
-     '%s.tex' % project,
-     u'%s Documentation' % project,
+     'doc-tempest-stress.tex',
+     u'Tempest-stress 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',
+}
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 36854eb..368f299 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -4,9 +4,7 @@
    contain the root `toctree` directive.
 
 Welcome to tempest_stress's documentation!
-========================================================
-
-Contents:
+==========================================
 
 .. toctree::
    :maxdepth: 2
diff --git a/tox.ini b/tox.ini
index b7035bb..a954812 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,13 @@ commands =
 [testenv:docs]
 commands = sphinx-build -W -b html doc/source doc/build/html
 
+[testenv:pdf-docs]
+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}