diff --git a/TODO b/TODO
index dbfe48eff9..5630c1c32e 100644
--- a/TODO
+++ b/TODO
@@ -27,6 +27,13 @@ External:
 
 Features:
 
+* gpt-auto-generator:
+  - Properly handle cryptsetup partitions
+  - Define new partition type for encrypted swap
+  - Make /home automount rather than mount?
+  - don't use blkid on every single partition, but on the main disk only
+  - automatically find root disk in initrd
+
 * improve journalctl performance by loading journal files
   lazily. Encode just enough information in the file name, so that we
   don't have to open it to know that it is not interesting for us, for
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index f34cd030c2..6267d9dba5 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -43,14 +43,6 @@
 #include "generator.h"
 #include "gpt.h"
 
-/* TODO:
- *
- * - Properly handle cryptsetup partitions
- * - Define new partition type for encrypted swap
- * - Make /home automount rather than mount
- *
- */
-
 static const char *arg_dest = "/tmp";
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe);