diff --git a/TODO.txt b/TODO.txt
new file mode 100644
index 000000000000..1b5fed54124f
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1,11 @@
+This file contains list of tasks that should be done before merging
+stdenv-updates back into trunk. Notation:
+- TODO
+* In progress
++ Done
+
+urkud:
+- Remove HAL
+- Remove old policykit
+- Introduce libiconvOrNull and libiconvOrLibc instead of current 'magic'
+