diff --git a/doc/flatpak-build-finish.xml b/doc/flatpak-build-finish.xml
index fa5c9ff0..093b6405 100644
--- a/doc/flatpak-build-finish.xml
+++ b/doc/flatpak-build-finish.xml
@@ -270,8 +270,7 @@
 [Policy subsystem]
 key=v1;v2;
 </programlisting>
-                </para></listitem>
-                <listitem><para>
+                </para><para>
                     This option can be used multiple times.
                 </para></listitem>
             </varlistentry>
diff --git a/doc/flatpak-build.xml b/doc/flatpak-build.xml
index d1157667..1c52b980 100644
--- a/doc/flatpak-build.xml
+++ b/doc/flatpak-build.xml
@@ -268,8 +268,7 @@
 [Policy subsystem]
 key=v1;v2;
 </programlisting>
-                </para></listitem>
-                <listitem><para>
+                </para><para>
                     This option can be used multiple times.
                 </para></listitem>
             </varlistentry>
diff --git a/doc/flatpak-metadata.xml b/doc/flatpak-metadata.xml
index 43cdd0a2..a38863fb 100644
--- a/doc/flatpak-metadata.xml
+++ b/doc/flatpak-metadata.xml
@@ -543,15 +543,13 @@
                         The absolute path on the host system of the app's
                         app files, as mounted at <filename>/app</filename>
                         inside the container. Available since 0.6.10.
-                    </para></listitem>
-                    <listitem><para>
+                    </para><para>
                         Since 1.12.0, if <command>flatpak run</command>
                         was run with the <option>--app-path</option> option,
                         this key gives the absolute path of whatever files
                         were mounted on <filename>/app</filename>, even if
                         that differs from the app's normal app files.
-                    </para></listitem>
-                    <listitem><para>
+                    </para><para>
                         If <command>flatpak run</command> was run with
                         <option>--app-path=</option> (resulting in an
                         empty directory being mounted on
@@ -567,8 +565,7 @@
                         the absolute path of the app's original files,
                         as mounted at <filename>/run/parent/app</filename>
                         inside the container. Available since 1.12.0.
-                    </para></listitem>
-                    <listitem><para>
+                    </para><para>
                         If this key is missing, the app files are given
                         by <option>app-path</option>.
                     </para></listitem>
@@ -621,8 +618,7 @@
                         The absolute path on the host system of the app's
                         runtime files, as mounted at <filename>/usr</filename>
                         inside the container. Available since 0.6.10.
-                    </para></listitem>
-                    <listitem><para>
+                    </para><para>
                         Since 1.12.0, if <command>flatpak run</command>
                         was run with the <option>--usr-path</option> option,
                         this key gives the absolute path of whatever files
@@ -638,8 +634,7 @@
                         the absolute path of the app's original runtime,
                         as mounted at <filename>/run/parent/usr</filename>
                         inside the container. Available since 1.12.0.
-                    </para></listitem>
-                    <listitem><para>
+                    </para><para>
                         If this key is missing, the runtime files are given
                         by <option>runtime-path</option>.
                     </para></listitem>
@@ -877,40 +872,40 @@
                         <variablelist>
                             <varlistentry>
                                 <term><option>active-gl-driver</option></term>
-                                <para>
+                                <listitem><para>
                                     Is true if the name of the active GL driver matches the
                                     extension point basename. Available since 0.9.1, and backported to
                                     the 0.8.x branch in 0.8.3.
-                                </para>
+                                </para></listitem>
                             </varlistentry>
                             <varlistentry>
                                 <term><option>active-gtk-theme</option></term>
-                                <para>
+                                <listitem><para>
                                     Is true if the name of the current GTK theme
                                     (via org.gnome.desktop.interface GSetting) matches the extension point
                                     basename. Added 0.10.1.
-                                </para>
+                                </para></listitem>
                             </varlistentry>
                             <varlistentry>
                                 <term><option>have-intel-gpu</option></term>
-                                <para>Is true if the i915 kernel module is loaded. Added 0.10.1.</para>
+                                <listitem><para>Is true if the i915 kernel module is loaded. Added 0.10.1.</para></listitem>
                             </varlistentry>
                             <varlistentry>
                                 <term><option>have-kernel-module-*</option></term>
-                                <para>
+                                <listitem><para>
                                     Is true if the suffix (case-sensitive) is found in <literal>/proc/modules</literal>.
                                     For example <literal>have-kernel-module-nvidia</literal>.
                                     Added 1.13.1.
-                                </para>
+                                </para></listitem>
                             </varlistentry>
                             <varlistentry>
                                 <term><option>on-xdg-desktop-*</option></term>
-                                <para>
+                                <listitem><para>
                                     Is true if the suffix (case-insensitively) is in the
                                     <literal>XDG_CURRENT_DESKTOP</literal> env var.
                                     For example <literal>on-xdg-desktop-GNOME-classic</literal>.
                                     Added 1.1.1.
-                                </para>
+                                </para></listitem>
                             </varlistentry>
                         </variablelist>
                     </listitem>
diff --git a/doc/flatpak-override.xml b/doc/flatpak-override.xml
index bdd9d974..9ec42c36 100644
--- a/doc/flatpak-override.xml
+++ b/doc/flatpak-override.xml
@@ -271,8 +271,7 @@
 [Policy subsystem]
 key=v1;v2;
 </programlisting>
-                </para></listitem>
-                <listitem><para>
+                </para><para>
                     This option can be used multiple times.
                 </para></listitem>
             </varlistentry>
diff --git a/doc/flatpak-run.xml b/doc/flatpak-run.xml
index 7b4e5605..723480f4 100644
--- a/doc/flatpak-run.xml
+++ b/doc/flatpak-run.xml
@@ -448,8 +448,7 @@
 [Policy subsystem]
 key=v1;v2;
 </programlisting>
-                </para></listitem>
-                <listitem><para>
+                </para><para>
                     This option can be used multiple times.
                 </para></listitem>
             </varlistentry>
@@ -737,8 +736,7 @@ key=v1;v2;
                     into <filename>/run/parent/usr</filename>, and will not
                     be included in the <envar>LD_LIBRARY_PATH</envar> inside
                     the sandbox.
-                </para></listitem>
-                <listitem><para>
+                </para><para>
                     This option will usually only be useful if it is
                     combined with <option>--app-path=</option> and
                     <option>--env=LD_LIBRARY_PATH=<replaceable>...</replaceable></option>.
diff --git a/doc/flatpak-spawn.xml b/doc/flatpak-spawn.xml
index 2d02da4d..6c8613f3 100644
--- a/doc/flatpak-spawn.xml
+++ b/doc/flatpak-spawn.xml
@@ -148,7 +148,7 @@
                   Note that absolute paths or subdirectories are not allowed.
                   The files must be in the <filename>sandbox</filename> subdirectory of
                   the instance directory (i.e. <filename>~/.var/app/$APP_ID/sandbox</filename>).
-                <para></para>
+                </para><para>
                   This option is useful in combination with <option>--sandbox</option> (otherwise the
                   instance directory is accessible anyway).
                 </para></listitem>
@@ -163,7 +163,7 @@
                   Note that absolute paths or subdirectories are not allowed.
                   The files must be in the <filename>sandbox</filename> subdirectory of
                   the instance directory (i.e. <filename>~/.var/app/$APP_ID/sandbox</filename>).
-                <para></para>
+                </para><para>
                   This option is useful in combination with <option>--sandbox</option> (otherwise the
                   instance directory is accessible anyway).
                 </para></listitem>