diff --git a/build/check_saml2.xsl b/build/check_saml2.xsl
index 3915264d..c4f8dbf5 100644
--- a/build/check_saml2.xsl
+++ b/build/check_saml2.xsl
@@ -42,4 +42,16 @@
 		</xsl:call-template>
 	</xsl:template> 
 
+	<!--
+        A SAML 2.0 IdP with an AttributeAuthority needs an AttributeService with an appropriate Binding.
+    -->
+	<xsl:template match="md:AttributeAuthorityDescriptor
+		[contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
+		[not(md:AttributeService[@Binding='urn:oasis:names:tc:SAML:2.0:bindings:SOAP'])]
+		">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">SAML 2.0 AttributeAuthority missing appropriately bound AttributeService</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
 </xsl:stylesheet>