diff --git a/Doc/source/ufoLib/index.rst b/Doc/source/ufoLib/index.rst
new file mode 100644
index 000000000..77c329ce1
--- /dev/null
+++ b/Doc/source/ufoLib/index.rst
@@ -0,0 +1,20 @@
+
+######
+ufoLib
+######
+
+.. toctree::
+   :maxdepth: 1
+
+   converters
+   errors
+   filenames
+   glifLib
+   kerning
+   utils
+   validators
+
+.. automodule:: fontTools.ufoLib
+   :inherited-members:
+   :members:
+   :undoc-members:
diff --git a/Doc/source/ufoLib/ufoLib.rst b/Doc/source/ufoLib/ufoLib.rst
deleted file mode 100644
index 3b3b0b1aa..000000000
--- a/Doc/source/ufoLib/ufoLib.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. highlight:: python
-
-======
-ufoLib
-======
-
-.. automodule:: ufoLib
-   :inherited-members:
-   :members: