diff --git a/doc/source/conf.py b/doc/source/conf.py
index f8b9e45850..b96a22dfab 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -93,6 +93,15 @@ version = glance_version.canonical_version_string()
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
 exclude_trees = ['api']
+exclude_patterns = [
+    # The man directory includes some snippet files that are included
+    # in other documents during the build but that should not be
+    # included in the toctree themselves, so tell Sphinx to ignore
+    # them when scanning for input files.
+    'man/footer.rst',
+    'man/general_options.rst',
+    'man/openstack_options.rst',
+]
 
 # The reST default role (for this markup: `text`) to use for all documents.
 #default_role = None
diff --git a/doc/source/index.rst b/doc/source/index.rst
index f13930f312..8a359f6cde 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -94,3 +94,12 @@ Using Glance
    glanceapi
    glanceclient
    glancemetadefcatalogapi
+
+Glance Manual Pages
+===================
+
+.. toctree::
+   :glob:
+   :maxdepth: 1
+
+   man/*