diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py
index db14808e84e..1f30e4315cf 100644
--- a/nixos/lib/make-options-doc/mergeJSON.py
+++ b/nixos/lib/make-options-doc/mergeJSON.py
@@ -73,7 +73,7 @@ class Renderer(mistune.renderers.BaseRenderer):
         return f"<literal>{escape(text)}</literal>"
     def block_code(self, text, info=None):
         info = f" language={quoteattr(info)}" if info is not None else ""
-        return f"<programlisting{info}>\n{escape(text)}</programlisting>"
+        return f"<programlisting{info}>{escape(text)}</programlisting>"
     def link(self, link, text=None, title=None):
         tag = "link"
         if link[0:1] == '#':
diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl
index ac49659c681..39d34fb8633 100644
--- a/nixos/lib/make-options-doc/options-to-docbook.xsl
+++ b/nixos/lib/make-options-doc/options-to-docbook.xsl
@@ -75,7 +75,8 @@
               <xsl:if test="attr[@name = 'default']">
                 <para>
                   <emphasis>Default:</emphasis>
-                  <xsl:text> </xsl:text>
+                  <xsl:text>
+</xsl:text>
                   <xsl:apply-templates select="attr[@name = 'default']/*" mode="top" />
                 </para>
               </xsl:if>
@@ -83,7 +84,8 @@
               <xsl:if test="attr[@name = 'example']">
                 <para>
                   <emphasis>Example:</emphasis>
-                  <xsl:text> </xsl:text>
+                  <xsl:text>
+</xsl:text>
                   <xsl:apply-templates select="attr[@name = 'example']/*" mode="top" />
                 </para>
               </xsl:if>
@@ -124,7 +126,8 @@
   <xsl:template match="attrs[attr[@name = '_type' and string[@value = 'literalExpression']]]" mode = "top">
     <xsl:choose>
       <xsl:when test="contains(attr[@name = 'text']/string/@value, '&#010;')">
-        <programlisting><xsl:value-of select="attr[@name = 'text']/string/@value" /></programlisting>
+        <programlisting><xsl:value-of select="attr[@name = 'text']/string/@value" /><xsl:text>
+</xsl:text></programlisting>
       </xsl:when>
       <xsl:otherwise>
         <literal><xsl:value-of select="attr[@name = 'text']/string/@value" /></literal>