diff --git a/factory/templates/locale.conf.in b/factory/templates/locale.conf.in
index 421fd569a9f..af93d043ec6 100644
--- a/factory/templates/locale.conf.in
+++ b/factory/templates/locale.conf.in
@@ -1 +1,3 @@
+# This is the fallback locale configuration provided by systemd.
+
 LANG="{{ SYSTEMD_DEFAULT_LOCALE }}"
diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index fe263fcfd84..df19f1a4356 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -32,7 +32,8 @@
 
     <para>The basic file format of <filename>locale.conf</filename> is
     a newline-separated list of environment-like shell-compatible
-    variable assignments. It is possible to source the configuration
+    variable assignments, ignoring comments and empty lines.
+    It is possible to source the configuration
     from shell scripts, however, beyond mere variable assignments, no
     shell features are supported, allowing applications to read the
     file without implementing a shell compatible execution
@@ -107,7 +108,9 @@
 
       <para><filename>/etc/locale.conf</filename>:</para>
 
-      <programlisting>LANG=de_DE.UTF-8
+      <programlisting># Custom settings
+
+LANG=de_DE.UTF-8
 LC_MESSAGES=en_US.UTF-8</programlisting>
     </example>