diff --git a/doc/source/conf.py b/doc/source/conf.py
index edd0343..a35d5a5 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,8 +24,8 @@ sys.path.insert(0, os.path.abspath('../..'))
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     'sphinx.ext.autodoc',
-    #'sphinx.ext.intersphinx',
-    'oslosphinx'
+    'oslosphinx',
+    'oslo_config.sphinxext',
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 9619d10..398d4e1 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -11,6 +11,7 @@ external processes.
 
    installation
    usage
+   opts
    contributing
    history
 
diff --git a/doc/source/opts.rst b/doc/source/opts.rst
new file mode 100644
index 0000000..27ee4fb
--- /dev/null
+++ b/doc/source/opts.rst
@@ -0,0 +1,8 @@
+=======================
+ Configuration Options
+=======================
+
+oslo.concurrency uses oslo.config to define and manage configuration options
+to allow the deployer to control how an application uses this library.
+
+.. show-options:: oslo.concurrency