diff --git a/doc/source/conf.py b/doc/source/conf.py
index a70063ee..7fe810ed 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,6 +50,9 @@ add_module_names = True
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# A list of ignored prefixes for module index sorting.
+modindex_common_prefix = ['magnumclient.']
+
 # -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
diff --git a/setup.cfg b/setup.cfg
index 8408b0ea..f864908d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,3 +56,7 @@ output_file = magnumclient/locale/magnumclient.pot
 
 [wheel]
 universal = 1
+
+[pbr]
+autodoc_index_modules = True
+warnerrors = True