diff --git a/doc/source/conf.py b/doc/source/conf.py
index eaeb3bc..c705364 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import datetime
-import sys
-import os
 
 # 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
@@ -100,11 +98,6 @@ html_theme = 'openstackdocs'
 # pixels large.
 #html_favicon = None
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
-html_last_updated_fmt = os.popen(git_cmd).read()
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
diff --git a/requirements.txt b/requirements.txt
index 562a2a6..ba3ff9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-openstackdocstheme>=1.19.0 # Apache-2.0
-pbr>=0.6
-sphinx>=1.1.2
+openstackdocstheme>=1.32.1 # Apache-2.0
+pbr>=2.0
+sphinx>=1.8.1
 testrepository>=0.0.18
 testtools>=0.9.34
diff --git a/setup.cfg b/setup.cfg
index 50147a3..1be7dd1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,14 +10,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[pbr]
-warnerrors = True
-
-[wheel]
-universal = 1
diff --git a/specs/kilo/bare-metal/bare-metal-enablement.rst b/specs/kilo/bare-metal/bare-metal-enablement.rst
index 9cb4d7d..1428184 100644
--- a/specs/kilo/bare-metal/bare-metal-enablement.rst
+++ b/specs/kilo/bare-metal/bare-metal-enablement.rst
@@ -191,11 +191,11 @@ References
 .. [IPMI] `IPMI tool source code
    <http://ipmitool.sourceforge.net/>`_
 
-.. [IRONIC_INSTALLATION_GUIDE] `Bare Metal Service Installation Guide
-   <https://docs.openstack.org/developer/ironic/deploy/install-guide.html>`_
-
 .. [PXE] `PXE user guide
    <https://docs.openstack.org/developer/ironic/deploy/user-guide.html#pxe>`_
 
 .. [REST_API_V1] `Bare Metal RESTful Web API v1
    <https://docs.openstack.org/developer/ironic/webapi/v1.html>`_
+
+`Bare Metal Service Installation Guide
+<https://docs.openstack.org/developer/ironic/deploy/install-guide.html>`_
diff --git a/tox.ini b/tox.ini
index 4a0ac5b..209adcc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,16 +2,15 @@
 envlist = docs
 
 [testenv]
+basepython = python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
-commands = python setup.py build_sphinx
+commands =
+  sphinx-build -W -b html doc/source doc/build/html