diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index a70c6ad..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,24 +0,0 @@
-## Global
-
-- improve error message (be more precise)
-- catch all exception
-- documentation (code + API)
-
-## Cable
-
-- fix *ch552* (*Sipeed tangNano*): works with *SRAM*, fails with *Flash*
-- *busblaster* support
-- *anlogic* cable support
-
-## Devices/boards
-
-- improve frequency configuration. Use FPGA, cable or --freq args maximum frequency
-- rework *cyclone10* eeprom access to avoid using FT2232 interfaceB Spi
-  emulation (only supported by trenz board)
-- fix checksum computation with *gowin GW2A*
-- add support for *tangPrimer* (*anlogic EG4S20*)
-
-## Misc
-
-- fix spiFlash class to be able to write everywhere (currently offset is hardcoded
-  to 0)
diff --git a/doc/index.rst b/doc/index.rst
index b1ce686..f206180 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -49,3 +49,9 @@ Also checkout the vendor-specific documentation:
   vendors/intel
   vendors/lattice
   vendors/xilinx
+
+.. toctree::
+  :caption: Development
+  :hidden:
+
+  todo
diff --git a/doc/todo.rst b/doc/todo.rst
new file mode 100644
index 0000000..ea81bb9
--- /dev/null
+++ b/doc/todo.rst
@@ -0,0 +1,31 @@
+.. _todo:
+
+To Do
+#####
+
+Global
+======
+
+* improve error message (be more precise)
+* catch all exception
+* documentation (code + API)
+
+Cable
+=====
+
+* fix *ch552* (*Sipeed tangNano*): works with *SRAM*, fails with *Flash*
+* *busblaster* support
+* *anlogic* cable support
+
+Devices/boards
+==============
+
+* improve frequency configuration. Use FPGA, cable or --freq args maximum frequency
+* rework *cyclone10* eeprom access to avoid using FT2232 interfaceB Spi emulation (only supported by trenz board)
+* fix checksum computation with *gowin GW2A*
+* add support for *tangPrimer* (*anlogic EG4S20*)
+
+Misc
+====
+
+* fix spiFlash class to be able to write everywhere (currently offset is hardcoded to 0)