diff --git a/Makefile.am b/Makefile.am
index 5a133da4668..32f08edb0d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -702,7 +702,9 @@ XML_DIRECTIVE_FILES = \
 	man/systemd.timer.xml \
 	man/systemd.snapshot.xml \
 	man/systemd.exec.xml \
-	man/systemd.device.xml
+	man/systemd.kill.xml \
+	man/systemd.device.xml \
+	man/systemd.conf.xml
 
 man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
diff --git a/make-directive-index.py b/make-directive-index.py
index 49d1028edb8..468ea583fb8 100644
--- a/make-directive-index.py
+++ b/make-directive-index.py
@@ -39,6 +39,15 @@ TEMPLATE = '''\
                 <variablelist id='unit-directives' />
         </refsect1>
 
+        <refsect1>
+                <title>System manager directives</title>
+
+                <para>Directives for configuring the behaviour of the
+                systemd process.</para>
+
+                <variablelist id='systemd-directives' />
+        </refsect1>
+
         <refsect1>
                 <title>UDEV directives</title>
 
@@ -101,6 +110,7 @@ def make_page(xml_files):
     directive_groups = {name:collections.defaultdict(list)
                         for name in ['unit-directives',
                                      'udev-directives',
+                                     'systemd-directives',
                                      ]}
     for page in xml_files:
         _extract_directives(directive_groups, page)
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index a550c2c71aa..7776c8f4f73 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -69,7 +69,7 @@
                 <para>All options are configured in the
                 <literal>[Manager]</literal> section:</para>
 
-                <variablelist>
+                <variablelist class='systemd-directives'>
 
                         <varlistentry>
                                 <term><varname>LogLevel=</varname></term>