diff --git a/doc/source/conf.py b/doc/source/conf.py
index 411645f..f56fe9b 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -96,7 +96,7 @@ show_authors = False
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+modindex_common_prefix = ['mistralclient.']
 
 
 # -- Options for HTML output -------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index 3a58eed..a753f5e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -117,3 +117,7 @@ cover-package = mistralclient
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
+
+[pbr]
+autodoc_index_modules = True
+warnerrors = True