diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8036067c8e..7369758835 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -46,7 +46,6 @@ sys.path.insert(0, os.path.abspath('./'))
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.todo',
               'sphinx.ext.coverage',
               'sphinx.ext.viewcode',
               'oslo_config.sphinxconfiggen',
diff --git a/setup.cfg b/setup.cfg
index 0e3b6fe2df..43bb672943 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -44,7 +44,7 @@ tag_date = 0
 tag_svn_revision = 0
 
 [build_sphinx]
-builders = html,man
+builder = html,man
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source