diff --git a/build/check_misc.xsl b/build/check_misc.xsl
index 09087b81..c8e55868 100644
--- a/build/check_misc.xsl
+++ b/build/check_misc.xsl
@@ -220,6 +220,20 @@
 		</xsl:call-template>
 	</xsl:template>
 
+
+	<!--
+		@Binding 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(@Binding, ' ')]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m"><xsl:value-of select='local-name()'/> Binding contains space character</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
 	<!--
 		Check for empty xml:lang elements, automatically generated by OIOSAML.