diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index ee3c1b6919..4ccc174bbc 100644
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -54,7 +54,7 @@
     <para>All options are configured in the
     <literal>[Coredump]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>Storage=</varname></term>
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index acc1817cd8..8fa557c0ba 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -51,7 +51,7 @@
     <para>All options are configured in the
     <literal>[Remote]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>Seal=</varname></term>
 
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index c3bfa47950..3dda3019b5 100644
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -48,7 +48,7 @@
 
     <para>All options are configured in the <literal>[Upload]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>URL=</varname></term>
 
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index a44b0e84ed..2791678a4f 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -50,7 +50,7 @@
     <para>All options are configured in the
     <literal>[Journal]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>Storage=</varname></term>
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index a407858957..ac8032ab4d 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -51,7 +51,7 @@
     <para>All options are configured in the
     <literal>[Login]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>NAutoVTs=</varname></term>
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 96e6d5e452..af61947c5c 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -112,7 +112,7 @@
     <filename>/etc/systemd/sleep.conf</filename> or a
     <filename>sleep.conf.d</filename> file:</para>
 
-    <variablelist class='systemd-directives'>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>AllowSuspend=</varname></term>
         <term><varname>AllowHibernation=</varname></term>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 73458fd5c7..27242b3a56 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -63,7 +63,7 @@
     <para>All options are configured in the
     <literal>[Manager]</literal> section:</para>
 
-    <variablelist class='systemd-directives'>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>LogLevel=</varname></term>
diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 23a4595fa9..d1878f8c6f 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -40,7 +40,7 @@
       ignored. The following variables can be set:
     </para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>udev_log=</varname></term>
 
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 9e4fe66b75..3202d48e9a 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -98,12 +98,12 @@ TEMPLATE = '''\
         </refsect1>
 
         <refsect1>
-                <title>System manager directives</title>
+                <title>Program configuration options</title>
 
                 <para>Directives for configuring the behaviour of the
-                systemd process.</para>
+                systemd process and other tools through configuration files.</para>
 
-                <variablelist id='systemd-directives' />
+                <variablelist id='config-directives' />
         </refsect1>
 
         <refsect1>