diff --git a/TODO b/TODO
index 7e0c725174..5d813a6cda 100644
--- a/TODO
+++ b/TODO
@@ -50,6 +50,8 @@ Features:
 
 * add prefix match to sysctl, tmpfiles, ...
 
+* send out "finished" signal when we are finished booting
+
 * drop /.readahead on bigger upgrades with yum
 
 * add inode stat() check to readahead to suppress preloading changed files
diff --git a/man/os-release.xml b/man/os-release.xml
index d8a45b303f..f85119d26a 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -116,10 +116,12 @@
                                 <term><varname>ID=</varname></term>
 
                                 <listitem><para>A lower-case string
-                                identifying the operating system,
-                                excluding any version information and
-                                suitable for processing by scripts. If
-                                not set defaults to
+                                (no spaces) identifying the operating
+                                system, excluding any version
+                                information and suitable for
+                                processing by scripts or usage in
+                                generated file names. If not set
+                                defaults to
                                 <literal>linux</literal>. Example:
                                 <literal>ID=fedora</literal>.</para></listitem>
                         </varlistentry>
@@ -128,10 +130,10 @@
                                 <term><varname>VERSION_ID=</varname></term>
 
                                 <listitem><para>A lower-case string
-                                (mostly numeric) identifying the
+                                (mostly numeric, no spaces) identifying the
                                 operating system version, excluding
                                 any name information and suitable for
-                                processing by scripts. Example:
+                                processing by scripts or usage in generated file names. Example:
                                 <literal>VERSION_ID=15</literal>.</para></listitem>
                         </varlistentry>