diff --git a/TODO b/TODO
index f2e47e4bd..d1576cf51 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,20 @@ Bugfixes:
 
 Features:
 
+* journal: OR matches are borked
+
+* journal: extend hash tables as we go
+
+* journal: API for looking for retrieving "all values of this field"
+
+* journal: deal nicely with byte-by-byte copied files, especially regards header
+
+* journal: local deserializer of export mode, http server
+
+* journal: message catalog
+
+* journal: forward-secure signatures
+
 * document the exit codes when services fail before they are exec()ed
 
 * rework namespace support, don't use pivot_root, and mount things after creating the namespace, not before
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
index 8737a4cac..5a2dab156 100644
--- a/src/systemd/sd-journal.h
+++ b/src/systemd/sd-journal.h
@@ -33,25 +33,6 @@
 extern "C" {
 #endif
 
-/* TODO:
- *
- *   - OR of matches is borked...
- *   - extend hash tables table as we go
- *   - accelerate looking for "all hostnames" and suchlike.
- *   - handle incomplete header
- *
- *   - kann NTP nicht finden?
- *
- *   - local deserializer
- *   - http server
- *   - message catalog
- *
- *   - check LE/BE conversion for 8bit, 16bit, 32bit values
- *   - cryptographic hash
- *   - think about manipulations of header
- *   - implement audit gateway
- */
-
 /* Write to daemon */
 
 int sd_journal_print(int piority, const char *format, ...) __attribute__ ((format (printf, 2, 3)));