diff --git a/doc/source/conf.py b/doc/source/conf.py
index 825fc278e..b52d5632a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -12,6 +12,7 @@ extensions = [
     'sphinx.ext.autodoc',
     'oslosphinx',
     'stevedore.sphinxext',
+    'oslo_config.sphinxext',
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/doc/source/opts.rst b/doc/source/opts.rst
index 8fc2bc736..9d94c185f 100644
--- a/doc/source/opts.rst
+++ b/doc/source/opts.rst
@@ -1,6 +1,15 @@
-----------------------
-Configuration Options
-----------------------
+=======================
+ Configuration Options
+=======================
+
+oslo.messaging uses oslo.config to define and manage configuration
+options to allow the deployer to control how an application uses the
+underlying messaging system.
+
+.. show-options:: oslo.messaging
+
+API
+===
 
 .. currentmodule:: oslo_messaging.opts