diff --git a/TODO b/TODO
index 0c648f9931..10baa1cec3 100644
--- a/TODO
+++ b/TODO
@@ -10,6 +10,14 @@ Bugfixes:
 
 * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
 
+After killing 'systemd --user', systemctl restart user@... fails.
+
+ExecStart with unicode characters fails in strv_split_quoted:
+
+          [Service]
+          Environment=ONE='one' "TWO='two two' too" THREE=
+          ExecStart=/bin/python3 -c 'import sys;print(sys.argv)' $ONE $TWO $THREE
+
 External:
 * Fedora: add an rpmlint check that verifies that all unit files in the RPM are listed in %systemd_post macros.