diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index eda28ec2..4858bd5c 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -7,5 +7,4 @@
 
    format
    mutable
-
-
+   options
diff --git a/doc/source/configuration/options.rst b/doc/source/configuration/options.rst
new file mode 100644
index 00000000..53173f34
--- /dev/null
+++ b/doc/source/configuration/options.rst
@@ -0,0 +1,7 @@
+========================================
+ Configuration Options from oslo.config
+========================================
+
+.. show-options::
+
+   oslo.config
diff --git a/doc/source/reference/builtins.rst b/doc/source/reference/builtins.rst
deleted file mode 100644
index fc80f74e..00000000
--- a/doc/source/reference/builtins.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-==================
- Built-in Options
-==================
-
-.. show-options:: oslo.config
diff --git a/doc/source/reference/index.rst b/doc/source/reference/index.rst
index 8bf214f7..63ffc502 100644
--- a/doc/source/reference/index.rst
+++ b/doc/source/reference/index.rst
@@ -18,7 +18,6 @@
    styleguide
    mutable
    locations
-   builtins
    sphinxext
    sphinxconfiggen
    faq