diff --git a/misc/config_tools/xforms/config.h.xsl b/misc/config_tools/xforms/config.h.xsl
index 05f431a8d..25cb2939e 100644
--- a/misc/config_tools/xforms/config.h.xsl
+++ b/misc/config_tools/xforms/config.h.xsl
@@ -43,18 +43,17 @@
       </xsl:otherwise>
     </xsl:choose>
     <xsl:value-of select="$key" />
-    <xsl:text> </xsl:text>
     <xsl:choose>
       <xsl:when test="$value != ''">
+	<xsl:text> </xsl:text>
 	<xsl:value-of select="$value" />
-	<xsl:text>&#xa;</xsl:text>
       </xsl:when>
       <xsl:when test="$default != ''">
 	<xsl:text> </xsl:text>
 	<xsl:value-of select="$default" />
-	<xsl:text>&#xa;</xsl:text>
       </xsl:when>
     </xsl:choose>
+    <xsl:value-of select="$newline" />
   </xsl:template>
 
   <xsl:template name="boolean-by-key-value">
diff --git a/misc/config_tools/xforms/config.mk.xsl b/misc/config_tools/xforms/config.mk.xsl
index a08b69ea8..93b27e793 100644
--- a/misc/config_tools/xforms/config.mk.xsl
+++ b/misc/config_tools/xforms/config.mk.xsl
@@ -41,13 +41,12 @@
     <xsl:choose>
       <xsl:when test="$value != ''">
 	<xsl:value-of select="$value" />
-	<xsl:text>&#xa;</xsl:text>
       </xsl:when>
       <xsl:when test="$default != ''">
 	<xsl:value-of select="$default" />
-	<xsl:text>&#xa;</xsl:text>
       </xsl:when>
     </xsl:choose>
+    <xsl:value-of select="$newline" />
   </xsl:template>
 
   <xsl:template name="boolean-by-key-value">
diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl
index 8f8999b25..584989337 100644
--- a/misc/config_tools/xforms/config_common.xsl
+++ b/misc/config_tools/xforms/config_common.xsl
@@ -208,26 +208,26 @@
 	<xsl:variable name="bus" select="substring-before($bdf, ':')" />
 	<xsl:variable name="device" select="substring-before(substring-after($bdf, ':'), '.')" />
 	<xsl:variable name="function" select="substring-after($bdf, '.')" />
+	<xsl:variable name="serial_bdf">
+	  <xsl:text>0b</xsl:text>
+	  <xsl:call-template name="hex-to-bin">
+	    <xsl:with-param name="s" select="$bus" />
+	    <xsl:with-param name="width" select="4" />
+	  </xsl:call-template>
+	  <xsl:call-template name="hex-to-bin">
+	    <xsl:with-param name="s" select="$device" />
+	    <xsl:with-param name="width" select="1" />
+	  </xsl:call-template>
+	  <xsl:call-template name="hex-to-bin">
+	    <xsl:with-param name="s" select="$function" />
+	    <xsl:with-param name="width" select="3" />
+	  </xsl:call-template>
+	</xsl:variable>
 
 	<xsl:call-template name="integer-by-key-value">
 	  <xsl:with-param name="key" select="'SERIAL_PCI_BDF'" />
+	  <xsl:with-param name="value" select="$serial_bdf" />
 	</xsl:call-template>
-
-	<xsl:text>0b</xsl:text>
-	<xsl:call-template name="hex-to-bin">
-	  <xsl:with-param name="s" select="$bus" />
-	  <xsl:with-param name="width" select="4" />
-	</xsl:call-template>
-	<xsl:call-template name="hex-to-bin">
-	  <xsl:with-param name="s" select="$device" />
-	  <xsl:with-param name="width" select="1" />
-	</xsl:call-template>
-	<xsl:call-template name="hex-to-bin">
-	  <xsl:with-param name="s" select="$function" />
-	  <xsl:with-param name="width" select="3" />
-	</xsl:call-template>
-	<xsl:value-of select="$integer-suffix" />
-	<xsl:text>&#xa;</xsl:text>
       </xsl:when>
       <xsl:otherwise>
 	<xsl:call-template name="boolean-by-key-value">