diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..a3a98ff
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,2 @@
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
+openstackdocstheme>=1.19.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f73b770..30cf41d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# ceilometer-powervm documentation build configuration file, created by
-# sphinx-quickstart on Tue Feb  3 09:06:25 2015.
+# ceilometer-powervm documentation build configuration file
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.
@@ -12,9 +9,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import subprocess
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -23,26 +19,17 @@ sys.path.insert(0, os.path.abspath('../..'))
 
 # -- General configuration ------------------------------------------------
 
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
-    'oslosphinx'
+    'openstackdocstheme'
 ]
 
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
 # The suffix of source filenames.
 source_suffix = '.rst'
 
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
 # The master toctree document.
 master_doc = 'index'
 
@@ -50,156 +37,24 @@ master_doc = 'index'
 project = u'ceilometer-powervm'
 copyright = u'2015, IBM'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-import ceilometer_powervm.version
-# The short X.Y version.
-version = ceilometer_powervm.version.version_info.version_string()
-# The full version, including alpha/beta/rc tags.
-release = ceilometer_powervm.version.version_info.release_string()
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
 
 # -- Options for HTML output ----------------------------------------------
 
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'openstackdocs'
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 #html_last_updated_fmt = '%b %d, %Y'
-git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
-           "-n1"]
-html_last_updated_fmt = subprocess.check_output(git_cmd).decode('utf-8')
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = '%sdoc' % project
+html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 
 # -- Options for LaTeX output ---------------------------------------------
 
-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': '',
-        }
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
@@ -210,26 +65,6 @@ latex_documents = [
      u'IBM', 'manual'),
 ]
 
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
 
 # -- Options for manual page output ---------------------------------------
 
@@ -242,34 +77,11 @@ man_pages = [
      u'IBM', 1)
 ]
 
-# If true, show URL addresses after external links.
-#man_show_urls = False
+
+# -- Options for openstackdocstheme ----------------------------------------
+
+repository_name = 'openstack/ceilometer-powervm'
+bug_project = 'ceilometer-powervm'
+bug_tag = ''
 
 
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    ('index',
-     '%s' % project,
-     u'%s Documentation' % project,
-     u'IBM',
-     '%s' % project,
-     'PowerVM compute agent plugins for OpenStack Ceilometer',
-     'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
-
diff --git a/setup.cfg b/setup.cfg
index 63a9c1a..02f7950 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,14 +24,6 @@ ceilometer.compute.virt =
 [files]
 packages = ceilometer_powervm
 
-[build_sphinx]
-all_files = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = ceilometer_powervm/locale
 domain = ceilometer-powervm
diff --git a/test-requirements.txt b/test-requirements.txt
index 18b5866..34d4b22 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,4 @@ stestr>=1.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 oslotest>=3.2.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
 mock>=2.0.0 # BSD
diff --git a/tox.ini b/tox.ini
index b416fd6..1e18e6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,11 +20,11 @@ setenv =
   OS_STDERR_CAPTURE=1
   OS_TEST_TIMEOUT=60
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       -egit+https://git.openstack.org/openstack/ceilometer#egg=ceilometer
-       -rhttps://git.openstack.org/cgit/openstack/ceilometer/plain/test-requirements.txt
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+  -egit+https://git.openstack.org/openstack/ceilometer#egg=ceilometer
+  -rhttps://git.openstack.org/cgit/openstack/ceilometer/plain/test-requirements.txt
 whitelist_externals =
   bash
   find
@@ -65,7 +65,10 @@ commands =
     coverage report
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:bashate]
 commands =