diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index 42bc3e6f..fa82eda5 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -27,9 +27,28 @@
 	<xsl:variable name="now" select="date:date-time()"/>
 	
 	<!--
-		Add a comment to the start of the output file.
+		Document root.
 	-->
 	<xsl:template match="/">
+		<xsl:call-template name="document.comment"/>
+		<xsl:apply-templates/>
+	</xsl:template>
+	
+	<!--
+		Document element.
+	-->
+	<xsl:template match="/md:EntitiesDescriptor">
+		<xsl:copy>
+			<xsl:apply-templates select="@*"/>
+			<xsl:call-template name="document.comment"/>
+			<xsl:apply-templates select="node()"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!--
+		Comment to be added to the top of the document, and just inside the document element.
+	-->
+	<xsl:template name="document.comment">
 		<xsl:comment>
 			<xsl:text>&#10;&#9;U K   F E D E R A T I O N   M E T A D A T A&#10;</xsl:text>
 			<xsl:text>&#10;</xsl:text>
@@ -37,7 +56,6 @@
 			<xsl:value-of select="$now"/>
 			<xsl:text>&#10;</xsl:text>
 		</xsl:comment>
-		<xsl:apply-templates/>
 	</xsl:template>
 	
 	<!--