diff --git a/TODO b/TODO
index 30b91a82..058095d6 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,18 @@
-- GtkDrawingArea backend
-- compute font sizes from keysym types (LETTER or FUNCTION)
-- eekboard: model and options selection
-- eekboard: typing monitor
-- matchbox-keyboard layout engine
-- .spec
+- packaging
+-- intltoolize
+-- GIR
+-- .spec
+-- debian
+-- add more tests
+-- add more doc comments including sample code
 
+- eekboard
+-- xklavier "model" and "options" configuration
+-- delay xklavier config menu creation
+-- typing monitor (create a full-screen window and handle all the key events)
+
+- libeek
+-- GtkDrawingArea backend
+-- compute font sizes from keysym types (LETTER or FUNCTION)
+-- matchbox-keyboard layout engine
+-- delay initialization of XKB and XKL layouts