diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml
index f978fef235e..7924641df96 100644
--- a/man/systemd.nspawn.xml
+++ b/man/systemd.nspawn.xml
@@ -112,7 +112,7 @@
     <para>Settings files may include an <literal>[Exec]</literal>
     section, which carries various execution parameters:</para>
 
-    <variablelist>
+    <variablelist class='nspawn-directives'>
 
       <varlistentry>
         <term><varname>Boot=</varname></term>
@@ -374,7 +374,7 @@
     section, which carries various parameters configuring the file
     system of the container:</para>
 
-    <variablelist>
+    <variablelist class='nspawn-directives'>
 
       <varlistentry>
         <term><varname>ReadOnly=</varname></term>
@@ -458,7 +458,7 @@
     section, which carries various parameters configuring the network
     connectivity of the container:</para>
 
-    <variablelist>
+    <variablelist class='nspawn-directives'>
 
       <varlistentry>
         <term><varname>Private=</varname></term>
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 3202d48e9a4..51f1d514fcc 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -97,6 +97,15 @@ TEMPLATE = '''\
                 <variablelist id='fstab-options' />
         </refsect1>
 
+        <refsect1>
+                <title><citerefentry><refentrytitle>systemd.nspawn</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                directives</title>
+
+                <para>Directives for configuring systemd-nspawn containers.</para>
+
+                <variablelist id='nspawn-directives' />
+        </refsect1>
+
         <refsect1>
                 <title>Program configuration options</title>
 
@@ -107,7 +116,7 @@ TEMPLATE = '''\
         </refsect1>
 
         <refsect1>
-                <title>command line options</title>
+                <title>Command line options</title>
 
                 <para>Command-line options accepted by programs in the
                 systemd suite.</para>