diff --git a/mdx/check_bindings.xsl b/mdx/check_bindings.xsl
index 61a4c03f..2525981a 100644
--- a/mdx/check_bindings.xsl
+++ b/mdx/check_bindings.xsl
@@ -17,7 +17,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 	<xsl:template match="md:ArtifactResolutionService
 		[@Binding != 'urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding']
diff --git a/mdx/check_framework.xsl b/mdx/check_framework.xsl
new file mode 100644
index 00000000..613c1b6a
--- /dev/null
+++ b/mdx/check_framework.xsl
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	check_framework.xsl
+	
+	XSL stylesheet providing a framework for use by rule checking files.
+	
+	Author: Ian A. Young <ian@iay.org.uk>
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+	<!--
+		The stylesheet output will be a text file, which will probably be thrown
+		away in any case.  The real output from the check is sent using the
+		xsl:message element.
+	-->
+	<xsl:output method="text"/>
+	
+
+	<!--
+		Common template to call to report an error on some element within an entity.
+	-->
+	<xsl:template name="error">
+		<xsl:param name="m"/>
+		<xsl:variable name="entity" select="ancestor-or-self::md:EntityDescriptor"/>
+		<xsl:message terminate='no'>
+			<xsl:text>[ERROR] </xsl:text>
+			<!--
+				If we're processing an aggregate, we need to indicate which
+				individual entity we're dealing with.
+			-->
+			<xsl:if test="ancestor-or-self::md:EntitiesDescriptor">
+				<!--
+					Use an ID if available, otherwise the entityID.
+				-->
+				<xsl:choose>
+					<xsl:when test="$entity/@ID">
+						<xsl:value-of select="$entity/@ID"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="$entity/@entityID"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:text>: </xsl:text>
+			</xsl:if>
+			<xsl:value-of select="$m"/>
+		</xsl:message>
+	</xsl:template>
+
+
+	<!--
+		Common template to call to report a warning on some element within an entity.
+	-->
+	<xsl:template name="warning">
+		<xsl:param name="m"/>
+		<xsl:variable name="entity" select="ancestor-or-self::md:EntityDescriptor"/>
+		<xsl:message terminate='no'>
+			<xsl:text>[WARN] </xsl:text>
+			<!--
+				If we're processing an aggregate, we need to indicate which
+				individual entity we're dealing with.
+			-->
+			<xsl:if test="ancestor-or-self::md:EntitiesDescriptor">
+				<!--
+					Use an ID if available, otherwise the entityID.
+				-->
+				<xsl:choose>
+					<xsl:when test="$entity/@ID">
+						<xsl:value-of select="$entity/@ID"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="$entity/@entityID"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:text>: </xsl:text>
+			</xsl:if>
+			<xsl:value-of select="$m"/>
+		</xsl:message>
+	</xsl:template>
+	
+	
+	<!--
+		Common template to call to report an informational message on some element within an entity.
+	-->
+	<xsl:template name="info">
+		<xsl:param name="m"/>
+		<xsl:variable name="entity" select="ancestor-or-self::md:EntityDescriptor"/>
+		<xsl:message terminate='no'>
+			<xsl:text>[INFO] </xsl:text>
+			<!--
+				If we're processing an aggregate, we need to indicate which
+				individual entity we're dealing with.
+			-->
+			<xsl:if test="ancestor-or-self::md:EntitiesDescriptor">
+				<!--
+					Use an ID if available, otherwise the entityID.
+				-->
+				<xsl:choose>
+					<xsl:when test="$entity/@ID">
+						<xsl:value-of select="$entity/@ID"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="$entity/@entityID"/>
+					</xsl:otherwise>
+				</xsl:choose>
+				<xsl:text>: </xsl:text>
+			</xsl:if>
+			<xsl:value-of select="$m"/>
+		</xsl:message>
+	</xsl:template>
+	
+	
+	<!-- Recurse down through all elements by default. -->
+	<xsl:template match="*">
+		<xsl:apply-templates select="node()|@*"/>
+	</xsl:template>
+	
+
+	<!-- Discard text blocks, comments and attributes by default. -->
+	<xsl:template match="text()|comment()|@*">
+		<!-- do nothing -->
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/mdx/check_future_0.xsl b/mdx/check_future_0.xsl
index 807ebacb..569a8e85 100644
--- a/mdx/check_future_0.xsl
+++ b/mdx/check_future_0.xsl
@@ -27,6 +27,6 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 </xsl:stylesheet>
diff --git a/mdx/check_future_1.xsl b/mdx/check_future_1.xsl
index d5506396..256c9247 100644
--- a/mdx/check_future_1.xsl
+++ b/mdx/check_future_1.xsl
@@ -27,7 +27,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 	<!--
 		Check for SAML 2.0 SPs with KeyName-only KeyDescriptors.
diff --git a/mdx/check_future_2.xsl b/mdx/check_future_2.xsl
index f0cd85d6..e8789585 100644
--- a/mdx/check_future_2.xsl
+++ b/mdx/check_future_2.xsl
@@ -27,7 +27,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 	<!--
 		Check for entities which have both PKIX-only KeyDescriptors (i.e.,
diff --git a/mdx/check_future_3.xsl b/mdx/check_future_3.xsl
index cb217a72..2b0adf50 100644
--- a/mdx/check_future_3.xsl
+++ b/mdx/check_future_3.xsl
@@ -27,7 +27,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 	
 </xsl:stylesheet>
diff --git a/mdx/check_future_4.xsl b/mdx/check_future_4.xsl
index 20b5fe61..476b65b4 100644
--- a/mdx/check_future_4.xsl
+++ b/mdx/check_future_4.xsl
@@ -27,6 +27,6 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 </xsl:stylesheet>
diff --git a/mdx/check_future_5.xsl b/mdx/check_future_5.xsl
index b368428d..bd07b278 100644
--- a/mdx/check_future_5.xsl
+++ b/mdx/check_future_5.xsl
@@ -20,6 +20,6 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 </xsl:stylesheet>
diff --git a/mdx/check_future_6.xsl b/mdx/check_future_6.xsl
index ec3472d7..3e955864 100644
--- a/mdx/check_future_6.xsl
+++ b/mdx/check_future_6.xsl
@@ -20,6 +20,6 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 </xsl:stylesheet>
diff --git a/mdx/check_future_7.xsl b/mdx/check_future_7.xsl
index 03148cd8..26274143 100644
--- a/mdx/check_future_7.xsl
+++ b/mdx/check_future_7.xsl
@@ -20,7 +20,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 
 </xsl:stylesheet>
diff --git a/mdx/check_future_8.xsl b/mdx/check_future_8.xsl
index c434b839..10f50242 100644
--- a/mdx/check_future_8.xsl
+++ b/mdx/check_future_8.xsl
@@ -20,7 +20,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 
 </xsl:stylesheet>
diff --git a/mdx/check_future_9.xsl b/mdx/check_future_9.xsl
index 48d359b2..9f25b941 100644
--- a/mdx/check_future_9.xsl
+++ b/mdx/check_future_9.xsl
@@ -20,7 +20,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 
 </xsl:stylesheet>
diff --git a/mdx/check_hoksso.xsl b/mdx/check_hoksso.xsl
index a820f20c..ed17d412 100644
--- a/mdx/check_hoksso.xsl
+++ b/mdx/check_hoksso.xsl
@@ -22,7 +22,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 
 	<!--
 		Schema checks.
diff --git a/mdx/check_regauth.xsl b/mdx/check_regauth.xsl
index 80518ecb..e98400ae 100644
--- a/mdx/check_regauth.xsl
+++ b/mdx/check_regauth.xsl
@@ -16,7 +16,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 	
 	<!--
         expectedAuthority
diff --git a/mdx/check_regscope.xsl b/mdx/check_regscope.xsl
index 238198af..fcae4300 100644
--- a/mdx/check_regscope.xsl
+++ b/mdx/check_regscope.xsl
@@ -16,7 +16,7 @@
 	<!--
 		Common support functions.
 	-->
-	<xsl:import href="../build/check_framework.xsl"/>
+	<xsl:import href="check_framework.xsl"/>
 	
 	<xsl:template match="shibmd:Scope[@regexp='true']">
 		<xsl:call-template name="error">