diff --git a/TODO b/TODO
index d629474c33..386599bc10 100644
--- a/TODO
+++ b/TODO
@@ -17,8 +17,6 @@ Bugfixes:
 
 External:
 
-* "systemctl edit" should know a mode to create a new unit file
-
 * Fedora: add an rpmlint check that verifies that all unit files in the RPM are listed in %systemd_post macros.
 
 * wiki: update journal format documentation for lz4 additions
@@ -28,6 +26,13 @@ External:
 
 Features:
 
+* "systemctl edit" should know a mode to create a new unit file
+
+* there's probably something wrong with having user mounts below /sys,
+  as we have for debugfs. for exmaple, src/core/mount.c handles mounts
+  prefixed with /sys generally special.
+  http://lists.freedesktop.org/archives/systemd-devel/2015-June/032962.html
+
 * Add PassEnvironment= setting to service units, to import select env vars from PID 1 into the service env block
 
 * nspawn: fix logic always print a final newline on output.