diff --git a/build.xml b/build.xml
index 5a62eea9..f825cc53 100644
--- a/build.xml
+++ b/build.xml
@@ -336,7 +336,7 @@
 		<!-- [2] -->
 		<XALAN x="master_ukfederation.xsl" i="${master.file.name}"
 			o="${uk.master.file}" />
-		<CHECK i="${xml.dir}/${uk.master.file}"/>
+		<CHECK i="${xml.dir}/${uk.master.file}" s="check.xsl"/>
 	</target>
 	
 	<target name="gen.uk.unsigned" depends="gen.uk.master">
@@ -516,6 +516,7 @@
 		***                                   ***
 		*****************************************
 	-->
+	
 	<target name="import.metadata">
 		<echo>Importing metadata from ${entities.dir}/import.xml</echo>
 		<java fork="true" maxmemory="384m" failonerror="true" classname="org.apache.xalan.xslt.Process">
@@ -532,6 +533,8 @@
 			<arg value="${build.dir}/import.xsl"/>
 		</java>
 		<echo>Imported metadata to ${entities.dir}/imported.xml</echo>
+		<CHECK i="${entities.dir}/imported.xml" s="check_imported.xsl"/>
+		<echo>Checked.</echo>
 	</target>
 	
 	<!--
@@ -543,13 +546,17 @@
 	-->
 	
 	<!--
-		Check a metadata document against our local conventions.
+		Check a metadata document against a set of conventions.
 		
 		Parameter 'i' is the file to be checked; no assumption is made
 		about its location so this must contain a full path.
+		
+		Parameter 's' is the checking stylesheet to use; assumed to be
+		present in the build.dir.
 	-->
 	<macrodef name="CHECK">
 		<attribute name="i"/>
+		<attribute name="s"/>
 		<sequential>
 			<java classname="uk.org.ukfederation.apps.mdcheck.MetadataCheck"
 				fork="true" failonerror="true" maxmemory="384m">
@@ -559,17 +566,11 @@
 				</classpath>
 				<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
 				<arg value="@{i}"/>
-				<arg value="${build.dir}/check.xsl"/>
+				<arg value="${build.dir}/@{s}"/>
 			</java>
 		</sequential>
 	</macrodef>
 	
-	<target name="err.test" depends="gen.uk.unsigned">
-		<echo>testing UK federation metadata</echo>
-		<CHECK i="${xml.dir}/${uk.metadata.unsigned}"/>
-		<echo>tested UK federation metadata</echo>
-	</target>
-
 	<!--
 		*******************************
 		***                         ***
diff --git a/build/check_imported.xsl b/build/check_imported.xsl
new file mode 100644
index 00000000..bc300773
--- /dev/null
+++ b/build/check_imported.xsl
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	check_imported.xsl
+	
+	XSL stylesheet that takes an imported metadata document destined for
+	the UK federation and checks it against local conventions.
+	
+	Author: Ian A. Young <ian@iay.org.uk>
+
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:set="http://exslt.org/sets"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+	xmlns:ukfxMail="xalan://uk.org.ukfederation.xalan.Mail"
+	xmlns:ukfxm="xalan://uk.org.ukfederation.xalan.Members"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+	<!--
+		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"/>
+	
+	<!--
+		Check for entities which do not have an OrganizationName at all.
+	-->
+	<xsl:template match="md:EntityDescriptor[not(md:Organization/md:OrganizationName)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">entity lacks OrganizationName</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
+
+	<!--
+		Checks for an IdP whose KeyDescriptor elements do not include a @use attribute.
+		This causes problems with the Shibboleth 1.3 SP prior to V1.3.1, which
+		interprets this as "no use permitted" rather than "either signing or encryption use
+		permitted".
+		
+		Two checks are required, one for each of the IdP role descriptors.
+	-->
+	
+	<xsl:template match="md:IDPSSODescriptor/md:KeyDescriptor[not(@use)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">IdP SSO KeyDescriptor lacking @use</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="md:AttributeAuthorityDescriptor/md:KeyDescriptor[not(@use)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">IdP AA KeyDescriptor lacking @use</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+	<!--
+		Check for role descriptors with missing KeyDescriptor elements.
+	-->
+	
+	<xsl:template match="md:IDPSSODescriptor[not(md:KeyDescriptor)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">IdP SSO Descriptor lacking KeyDescriptor</xsl:with-param>
+		</xsl:call-template>	
+	</xsl:template>
+	
+	<xsl:template match="md:SPSSODescriptor[not(md:KeyDescriptor)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">SP SSO Descriptor lacking KeyDescriptor</xsl:with-param>
+		</xsl:call-template>	
+	</xsl:template>
+	
+	<xsl:template match="md:AttributeAuthorityDescriptor[not(md:KeyDescriptor)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">IdP AA Descriptor lacking KeyDescriptor</xsl:with-param>
+		</xsl:call-template>	
+	</xsl:template>
+	
+	
+	<!--
+		Check for a construct which is known to cause the Shibboleth 1.3 SP to dump core.
+		
+			<md:KeyDescriptor use="signing">
+				<ds:KeyInfo>
+					<KeyName>blabla<KeyName>
+				</ds:KeyInfo>
+			</md:KeyDescriptor>
+		
+		The issue here is that the KeyName does not have the ds: namespace.
+	-->
+	<xsl:template match="ds:KeyInfo/*[namespace-uri() != 'http://www.w3.org/2000/09/xmldsig#']">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">ds:KeyInfo child element not in ds namespace</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+	<!--
+		Entity IDs should not contain space characters.
+	-->
+	<xsl:template match="md:EntityDescriptor[contains(@entityID, ' ')]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">entity ID contains space character</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+	<!--
+		@Location attributes should not contain space characters.
+		
+		This may be a little strict, and might be better confined to md:* elements.
+		At present, however, this produces no false positives.
+	-->
+	<xsl:template match="*[contains(@Location, ' ')]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m"><xsl:value-of select='local-name()'/> Location contains space character</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+	<!--
+		Checks on the DiscoveryResponse extension.
+	-->
+	
+	<xsl:template match="idpdisc:DiscoveryResponse[not(@Binding)]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">missing Binding attribute on DiscoveryResponse</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="idpdisc:DiscoveryResponse[@Binding]
+		[@Binding!='urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol']">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">incorrect Binding value on DiscoveryResponse</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+	<!--
+		Check for Locations that don't start with https://
+		
+		This may be a little strict, and might be better confined to md:* elements.
+		In addition, we might at some point require more complex rules: whitelisting certain
+		entities, or permitting http:// to Locations associated with certain bindngs.
+		
+		At present, however, this simpler rule produces no false positives.
+	-->
+	<xsl:template match="*[@Location and not(starts-with(@Location,'https://'))]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m"><xsl:value-of select='local-name()'/> Location does not start with https://</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
+	<!--
+		Common template to call to report a fatal error on some element within an entity.
+	-->
+	<xsl:template name="fatal">
+		<xsl:param name="m"/>
+		<xsl:message terminate='no'>
+			<xsl:text>*** </xsl:text>
+			<xsl:value-of select="ancestor-or-self::md:EntityDescriptor/@entityID"/>
+			<xsl:text>: </xsl:text>
+			<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>