diff --git a/docs/bucket.rst b/docs/bucket.rst
index 4b784174..297d2b46 100644
--- a/docs/bucket.rst
+++ b/docs/bucket.rst
@@ -7,7 +7,3 @@ RiakBucket
 .. currentmodule:: riak.bucket
 
 .. autoclass:: riak.bucket.RiakBucket
-   :members:
-   :member-order: bysource
-   :undoc-members:
-
diff --git a/docs/conf.py b/docs/conf.py
index 77272f27..7e4e2500 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -254,3 +254,7 @@
 
 # Allow duplicate toc entries.
 #epub_tocdup = True
+
+# Autodoc settings
+autodoc_default_flags = ['members', 'undoc-members']
+autodoc_member_order = 'bysource'