diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1b2a8a9..6cc504d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -85,7 +85,7 @@ exclude_patterns = []
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+modindex_common_prefix = ['designateclient']
 
 
 # -- Options for HTML output ---------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index 13bf17a..92476e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -173,3 +173,7 @@ output_file = designateclient/locale/designateclient.pot
 
 [wheel]
 universal = 1
+
+[pbr]
+autodoc_index_modules = True
+warnerrors = True