diff --git a/mdx/check_bindings.xsl b/mdx/check_bindings.xsl
index eb910c17..3ba8c85f 100644
--- a/mdx/check_bindings.xsl
+++ b/mdx/check_bindings.xsl
@@ -33,6 +33,41 @@
 		</xsl:call-template>
 	</xsl:template>
 	
+	<xsl:template match="md:ManageNameIDService
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP']
+		">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>invalid binding '</xsl:text>
+				<xsl:value-of select="@Binding"/>
+				<xsl:text>' on </xsl:text>
+				<xsl:value-of select="name()"/>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="md:SingleLogoutService
+		[@Binding != 'http://schemas.xmlsoap.org/ws/2003/07/secext']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP']
+		">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>invalid binding '</xsl:text>
+				<xsl:value-of select="@Binding"/>
+				<xsl:text>' on </xsl:text>
+				<xsl:value-of select="name()"/>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 	<xsl:template match="md:SingleSignOnService
 		[@Binding != 'urn:mace:shibboleth:1.0:profiles:AuthnRequest']
 		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']
@@ -50,4 +85,23 @@
 		</xsl:call-template>
 	</xsl:template>
 	
+	<xsl:template match="md:*
+		[@Binding]
+		[local-name() != 'ArtifactResolutionService']
+		[local-name() != 'AssertionConsumerService']
+		[local-name() != 'AttributeService']
+		[local-name() != 'ManageNameIDService']
+		[local-name() != 'SingleLogoutService']
+		[local-name() != 'SingleSignOnService']
+		">
+		<xsl:call-template name="warning">
+			<xsl:with-param name="m">
+				<xsl:text>unknown binding '</xsl:text>
+				<xsl:value-of select="@Binding"/>
+				<xsl:text>' on </xsl:text>
+				<xsl:value-of select="name()"/>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 </xsl:stylesheet>
diff --git a/mdx/check_future_5.xsl b/mdx/check_future_5.xsl
index a30f5172..b368428d 100644
--- a/mdx/check_future_5.xsl
+++ b/mdx/check_future_5.xsl
@@ -22,30 +22,4 @@
 	-->
 	<xsl:import href="../build/check_framework.xsl"/>
 
-
-	<xsl:template match="md:*
-		[local-name() != 'ArtifactResolutionService']
-		[local-name() != 'AttributeService']
-		[local-name() != 'SingleSignOnService']
-		[@Binding != 'http://schemas.xmlsoap.org/ws/2003/07/secext']
-		[@Binding != 'urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding']
-		[@Binding != 'urn:oasis:names:tc:SAML:1.0:profiles:artifact-01']
-		[@Binding != 'urn:oasis:names:tc:SAML:1.0:profiles:browser-post']
-		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact']
-		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']
-		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign']
-		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect']
-		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS']
-		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP']
-		">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">
-				<xsl:text>invalid binding '</xsl:text>
-				<xsl:value-of select="@Binding"/>
-				<xsl:text>' on </xsl:text>
-				<xsl:value-of select="name()"/>
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
 </xsl:stylesheet>
diff --git a/mdx/check_future_6.xsl b/mdx/check_future_6.xsl
index d7d88d6d..d0be256b 100644
--- a/mdx/check_future_6.xsl
+++ b/mdx/check_future_6.xsl
@@ -22,5 +22,23 @@
 	-->
 	<xsl:import href="../build/check_framework.xsl"/>
 
+	<xsl:template match="md:AssertionConsumerService
+		[@Binding != 'http://schemas.xmlsoap.org/ws/2003/07/secext']
+		[@Binding != 'urn:oasis:names:tc:SAML:1.0:profiles:artifact-01']
+		[@Binding != 'urn:oasis:names:tc:SAML:1.0:profiles:browser-post']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign']
+		[@Binding != 'urn:oasis:names:tc:SAML:2.0:bindings:PAOS']
+		">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>invalid binding '</xsl:text>
+				<xsl:value-of select="@Binding"/>
+				<xsl:text>' on </xsl:text>
+				<xsl:value-of select="name()"/>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
 
 </xsl:stylesheet>