diff --git a/doc/source/index.rst b/doc/source/index.rst
index d3c8872fa0c3..de1f674098d4 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -54,10 +54,9 @@ Compute API v2
 ==============
 
 .. toctree::
-   :glob:
    :maxdepth: 1
 
-   v2/*
+   v2/index
 
 API Extensions
 ==============
diff --git a/doc/source/v2/index.rst b/doc/source/v2/index.rst
index 9cef212ecd4d..8cc92c5c693c 100644
--- a/doc/source/v2/index.rst
+++ b/doc/source/v2/index.rst
@@ -20,6 +20,18 @@ This section describes the Compute API version 2 and is intended for software
 developers interested in developing applications using the OpenStack Compute
 Application Programming Interface (API).
 
-..toctree::
+.. toctree::
     :maxdepth: 3
-    :glob:
+
+    2.0_general_info
+    2.0_server_concepts
+    authentication
+    extensions
+    faults
+    limits
+    links_and_references
+    paginated_collections
+    polling_changes-since_parameter
+    request_and_response_formats
+    versions
+