diff --git a/doc/requirements.txt b/doc/requirements.txt
index 383055c0..8d56e6a2 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,5 @@
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 
 # releasenotes
-reno>=2.5.0 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index c75e8c0c..cf1595cf 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -26,9 +26,11 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/ovsdbapp'
-bug_project = 'ovsdbapp'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/ovsdbapp'
+openstackdocs_pdf_link = True
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'ovsdbapp'
+openstackdocs_bug_tag = ''
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
@@ -52,7 +54,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index d227326f..e9116638 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -21,7 +21,6 @@ mccabe==0.2.1
 mock==2.0.0
 mox3==0.20.0
 netaddr==0.7.18
-openstackdocstheme==1.18.1
 os-client-config==1.28.0
 os-testr==1.0.0
 oslo.utils==3.33.0
@@ -36,13 +35,10 @@ python-mimeparse==1.6.0
 python-subunit==1.0.0
 pytz==2013.6
 PyYAML==3.12
-reno==2.5.0
 requests==2.14.2
 requestsexceptions==1.2.0
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.6.2
-sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
 stestr==2.0.0
 testscenarios==0.4
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 43fb41e3..eb5446bc 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -40,9 +40,10 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/ovsdbapp'
-bug_project = 'ovsdbapp'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/ovsdbapp'
+openstackdocs_auto_name = False
+openstackdocs_bug_project = 'ovsdbapp'
+openstackdocs_bug_tag = ''
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -100,7 +101,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -149,10 +150,6 @@ html_theme = 'openstackdocs'
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True