diff --git a/doc/aerospike.rst b/doc/aerospike.rst
index e16564b636..9388d9ea79 100644
--- a/doc/aerospike.rst
+++ b/doc/aerospike.rst
@@ -7,9 +7,7 @@
 Overview
 ========
 
-.. module:: aerospike
-    :platform: 64-bit Linux and OS X
-    :synopsis: Aerospike client for Python.
+.. automodule:: aerospike
 
 ``aerospike`` is a package which provides a Python client for Aerospike database clusters.
 
diff --git a/doc/conf.py b/doc/conf.py
index 171c556781..b16e8bbea3 100755
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -26,7 +26,7 @@ def __getattr__(cls, name):
         return MagicMock()
 
 
-sys.modules.update({"aerospike": Mock()})
+# sys.modules.update({"aerospike": Mock()})
 
 # sys.path.append(os.path.abspath('/usr/local/lib/python2.7/site-packages/aerospike-1.0.44-py2.7-macosx-10.9-x86_64.egg/'))
 
@@ -39,7 +39,8 @@ def __getattr__(cls, name):
     "sphinx.ext.autodoc",
     "sphinx.ext.intersphinx",
     "sphinx.ext.napoleon",
-    "sphinxcontrib.spelling"
+    "sphinxcontrib.spelling",
+    "sphinx.ext.autosummary"
 ]
 napoleon_google_docstring = True
 intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}