diff --git a/TODO b/TODO
index 326edb0af89..4519037ae7f 100644
--- a/TODO
+++ b/TODO
@@ -83,14 +83,10 @@ Features:
 
 * currently system services appear not to generate core dumps...
 
-* introduce /run/kmsg in containers?
-
 * wall messages for shutdown should move to logind
 
 * allow writing multiple conditions in unit files on one line
 
-* journal: json output needs to be able to deal with multiple assignments of the same field
-
 * There's something wrong with escaping unit names: http://lists.freedesktop.org/archives/systemd-devel/2012-August/006292.html
 
 * cleanup ellipsation for log output in journalctl and systemctl status: have a sane way to disable ellipsation, and disable it by default when invoked in less/more
@@ -103,8 +99,6 @@ Features:
 
 * maybe make systemd-detect-virt suid? or use fscaps?
 
-* man: document in ExecStart= explicitly that we don't take shell command lines, only executable names with arguments
-
 * shutdown: don't read-only mount anything when running in container
 
 * nspawn: --read-only is not applied recursively to submounts
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 72b67c69880..c547948c6e9 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -356,7 +356,16 @@
                                 argument (i.e. the program to execute)
                                 may not be a variable, and must be a
                                 literal and absolute path
-                                name.</para></listitem>
+                                name.</para>
+
+                                <para>Note that this setting does not
+                                directly support shell command
+                                lines. If shell command lines are to
+                                be used they need to be passed
+                                explicitly to a shell implementation
+                                of some kind. Example:
+                                <literal>ExecStart=/bin/sh -c 'dmesg | tac'</literal></para>
+                                </listitem>
                         </varlistentry>
 
                         <varlistentry>