diff --git a/doc/api.rst b/doc/api.rst
index 06f233054..c9f8427b3 100644
--- a/doc/api.rst
+++ b/doc/api.rst
@@ -1,8 +1,16 @@
-migen Package
-=============
+migen API Documentation
+=======================
+
+:mod:`fhdl.structure` Module
+------------------------------
+
+.. automodule:: migen.fhdl.structure
+        :members:
+        :show-inheritance:
 
 :mod:`genlib.fifo` Module
 ------------------------------
 
 .. automodule:: migen.genlib.fifo
         :members:
+        :show-inheritance:
diff --git a/doc/index.rst b/doc/index.rst
index 6c21d762f..076f8c3e5 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -11,3 +11,11 @@ Migen manual
    simulation
    casestudies
    api
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`search`
+
+.. * :ref:`modindex`