diff --git a/develop/architecture.rst b/develop/architecture.rst
index aeb3a24..3e10bc3 100644
--- a/develop/architecture.rst
+++ b/develop/architecture.rst
@@ -19,7 +19,7 @@ You should also be somewhat familiar with the
 .. note::
 
    This document is a work in progress and is still incomplete.
-   As usually, feel free to ask any questions in #limnoria @ freenode.
+   As usual, feel free to ask any questions in #limnoria @ freenode.
 
 Main loop and drivers
 =====================
diff --git a/generate_plugin_doc.py b/generate_plugin_doc.py
index a3a37b6..4cef831 100755
--- a/generate_plugin_doc.py
+++ b/generate_plugin_doc.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import importlib
 import os
 import pkgutil
 import subprocess
@@ -40,8 +41,25 @@ with open(os.path.join(OUTPUT_DIR, "index.rst"), "w") as fd:
 
             .. _Limnoria.net's plugin page: https://limnoria.net/plugins.xhtml
 
+            """
+        )
+    )
+
+    for plugin in plugins:
+        if plugin == "Alias":
+            # Deprecated
+            continue
+        plugin_module = importlib.import_module(f"supybot.plugins.{plugin}")
+        fd.write(f":doc:`{plugin} <{plugin}>`\n")
+        fd.write(textwrap.indent(plugin_module.__doc__, "    "))
+        fd.write("\n")
+
+    fd.write(
+        textwrap.dedent(
+            """
             .. toctree::
                :maxdepth: 1
+               :hidden:
 
             """
         )