diff --git a/man/machine-info.xml b/man/machine-info.xml
index 476996ce5f..5a268c9f36 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -58,7 +58,7 @@
     <para>The following machine metadata parameters may be set using
     <filename>/etc/machine-info</filename>:</para>
 
-    <variablelist>
+    <variablelist class='environment-variables'>
 
       <varlistentry>
         <term><varname>PRETTY_HOSTNAME=</varname></term>
diff --git a/man/os-release.xml b/man/os-release.xml
index ea71b36c1e..6de0cd7148 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -90,7 +90,7 @@
     <para>The following OS identifications parameters may be set using
     <filename>os-release</filename>:</para>
 
-    <variablelist>
+    <variablelist class='environment-variables'>
 
       <varlistentry>
         <term><varname>NAME=</varname></term>
diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml
index fc8b2cb3ef..a0ca83507d 100644
--- a/man/vconsole.conf.xml
+++ b/man/vconsole.conf.xml
@@ -68,7 +68,7 @@
 
     <para>The following options are understood:</para>
 
-    <variablelist>
+    <variablelist class='environment-variables'>
 
       <varlistentry>
         <term><varname>KEYMAP=</varname></term>
diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 8703c8a37b..9e4fe66b75 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -46,8 +46,8 @@ TEMPLATE = '''\
         <refsect1>
                 <title>Environment variables</title>
 
-                <para>Environment variables understood by the systemd
-                manager and other programs.</para>
+                <para>Environment variables understood by the systemd manager
+                and other programs and environment variable-compatible settings.</para>
 
                 <variablelist id='environment-variables' />
         </refsect1>