diff --git a/TODO b/TODO
deleted file mode 100644
index 9d4ffcd3..00000000
--- a/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-* Add, console/tty/getty option to finit.conf, e.g. "tty /dev/ttyUSB0" 
-* FHS changes, see http://askubuntu.com/questions/57297/why-has-var-run-been-migrated-to-run
-* Look at Erik Troan's nash linuxrc parser for more inspiration
-* Look at how to support a standard SysV init runlevel mechanism
-* Arguments to finit, like SysV init's "init q" to reload finit.conf at runtime, etc.
-* Implement initctl stop|start|reload <SVC> and service <SVC> stop|start|reload on top
-* Write man pages for finit and finit.conf, steal from pimd man pages...
-* Add support for basic runlevels: startup, running (services from finit.conf), and shutdown
-
-
diff --git a/TODO b/TODO
new file mode 120000
index 00000000..9482e6cf
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+TODO.rst
\ No newline at end of file
diff --git a/TODO.rst b/TODO.rst
new file mode 100644
index 00000000..cf3f8fe9
--- /dev/null
+++ b/TODO.rst
@@ -0,0 +1,49 @@
+==============================================================================
+                                    TODO
+==============================================================================
+Unsorted TODO list of features and points of investigation that could be
+useful for improving finit.
+
+Runlevels
+---------
+   * Improve support for runlevels: startup, running (services from
+     finit.conf), and shutdown as well as hooks when switching RL,
+     startup at RL 1 and a default run level.
+   * Implement initctl stop|start|restart|reload|status <SVC> and
+     service <SVC> stop|start|restart|reload|status on top
+
+Configuration
+-------------
+   * Add support for "init <q | reload-configuration>" and SIGHUP to
+     reload finit.conf, but also
+   * Add support for inotify to automatically reload finit.conf
+
+Services and Tasks
+------------------
+   * Add support for "task [RUNLVL] ..." similar to services, but
+     one-shot. Needs a trigger/when
+   * Add support for service/task dependencies
+   * Add support for "init list" to show running services
+
+Miscellaneous
+-------------
+   * Add support for "init -v,--version | version"
+
+Documentation
+-------------
+
+   * Write man pages for finit and finit.conf, steal from pimd man pages...
+   * Update Debian finit.conf example with runlevels, tty/console and
+     dependency handling
+
+Investigation
+-------------
+
+   * Investigate FHS changes affecting runtime status etc., see
+     http://askubuntu.com/questions/57297/why-has-var-run-been-migrated-to-run
+
+..
+.. Local Variables:
+..  mode: rst
+..  version-control: t
+.. End: