diff --git a/TODO b/TODO
index 9b79dd560e..e38d829279 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,9 @@
+Fixes needed before 217:
+
+* change startup timeout to not cover the full bootup, but only sysinit part (see below)
+
+* remove Discard= in .mount units and replace it by Options=, to prepare for later swapon fix
+
 Bugfixes:
 
 * Re-enable "fsck -l" when it is ready: