diff --git a/acme/docs/api/challenges.rst b/acme/docs/api/challenges.rst
new file mode 100644
index 000000000..7bc084fe9
--- /dev/null
+++ b/acme/docs/api/challenges.rst
@@ -0,0 +1,5 @@
+Challenges
+----------
+
+.. automodule:: acme.challenges
+   :members:
diff --git a/acme/docs/api/client.rst b/acme/docs/api/client.rst
new file mode 100644
index 000000000..d0ab89eb2
--- /dev/null
+++ b/acme/docs/api/client.rst
@@ -0,0 +1,5 @@
+Client
+------
+
+.. automodule:: acme.client
+   :members:
diff --git a/acme/docs/api/errors.rst b/acme/docs/api/errors.rst
new file mode 100644
index 000000000..644ff0e71
--- /dev/null
+++ b/acme/docs/api/errors.rst
@@ -0,0 +1,5 @@
+Errors
+------
+
+.. automodule:: acme.errors
+   :members:
diff --git a/acme/docs/api/fields.rst b/acme/docs/api/fields.rst
new file mode 100644
index 000000000..c224f7fef
--- /dev/null
+++ b/acme/docs/api/fields.rst
@@ -0,0 +1,5 @@
+Fields
+------
+
+.. automodule:: acme.fields
+   :members:
diff --git a/acme/docs/api/index.rst b/acme/docs/api/index.rst
deleted file mode 100644
index 23c5a3284..000000000
--- a/acme/docs/api/index.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-:mod:`acme`
-===========
-
-.. contents::
-
-.. automodule:: acme
-   :members:
-
-
-Client
-------
-
-.. automodule:: acme.client
-   :members:
-
-
-Messages
---------
-
-.. automodule:: acme.messages
-   :members:
-
-
-Challenges
-----------
-
-.. automodule:: acme.challenges
-   :members:
-
-
-Other ACME objects
-------------------
-
-.. automodule:: acme.other
-   :members:
-
-
-Fields
-------
-
-.. automodule:: acme.fields
-   :members:
-
-
-Errors
-------
-
-.. automodule:: acme.errors
-   :members:
-
-
-Standalone
-----------
-
-.. automodule:: acme.standalone
-   :members:
diff --git a/acme/docs/api/messages.rst b/acme/docs/api/messages.rst
new file mode 100644
index 000000000..0374a72c8
--- /dev/null
+++ b/acme/docs/api/messages.rst
@@ -0,0 +1,5 @@
+Messages
+--------
+
+.. automodule:: acme.messages
+   :members:
diff --git a/acme/docs/api/other.rst b/acme/docs/api/other.rst
new file mode 100644
index 000000000..eb27a5d53
--- /dev/null
+++ b/acme/docs/api/other.rst
@@ -0,0 +1,5 @@
+Other ACME objects
+------------------
+
+.. automodule:: acme.other
+   :members:
diff --git a/acme/docs/api/standalone.rst b/acme/docs/api/standalone.rst
new file mode 100644
index 000000000..a65e5df2a
--- /dev/null
+++ b/acme/docs/api/standalone.rst
@@ -0,0 +1,5 @@
+Standalone
+----------
+
+.. automodule:: acme.standalone
+   :members:
diff --git a/acme/docs/index.rst b/acme/docs/index.rst
index 940d79037..8d298054e 100644
--- a/acme/docs/index.rst
+++ b/acme/docs/index.rst
@@ -13,6 +13,9 @@ Contents:
 
    api
 
+.. automodule:: acme
+   :members:
+
 
 Indices and tables
 ==================