diff --git a/TODO b/TODO
index 5e4d7495e02..56d0a9df6fd 100644
--- a/TODO
+++ b/TODO
@@ -178,11 +178,12 @@ Features:
 External:
 
 * dbus:
-   - get process transport into dbus for systemctl -P/-H
+   - get process transport into dbus for systemctl -P/-H (PENDING)
    - dbus --user
-   - natively watch for dbus-*.service symlinks
+   - natively watch for dbus-*.service symlinks (PENDING)
    - allow specification of socket mode/umask when allocating DBusServer
    - allow disabling of fd passing when connecting a AF_UNIX connection
+   - allow disabling of UID passing for AUTH EXTERNAL
 
 * systemd --user
     PR_SET_CHILD_REAPER patch: https://lkml.org/lkml/2011/7/28/426
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ce6833b8438..bf32a89b3ad 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -670,8 +670,8 @@
                                 <option>keep-caps-locked</option>,
                                 <option>no-setuid-fixup</option>,
                                 <option>no-setuid-fixup-locked</option>,
-                                <option>no-setuid-noroot</option> and/or
-                                <option>no-setuid-noroot-locked</option>.
+                                <option>noroot</option> and/or
+                                <option>noroot-locked</option>.
                                 </para></listitem>
                         </varlistentry>