diff --git a/doc/source/todo.rst b/doc/source/todo.rst
index 06b0999..8f87c26 100644
--- a/doc/source/todo.rst
+++ b/doc/source/todo.rst
@@ -67,4 +67,12 @@
 Furthermore, ``$CWD`` and ``~`` might not make a lot of sense in all
 use-cases.
 
+Class subdirectories
+--------------------
+It would be nice syntactic sugar to allow classes to sit in subdirectories,
+such that ``ssh.server`` would load a class in …/ssh/server.yml (assuming
+``yaml_fs``).
+
+See `this pull request for a discussion about it <https://github.com/madduck/reclass/pull/12>`_.
+
 .. include:: substs.inc