diff --git a/mdx/_rules/check_hasreginfo.xsl b/mdx/_rules/check_hasreginfo.xsl
new file mode 100644
index 00000000..f3319047
--- /dev/null
+++ b/mdx/_rules/check_hasreginfo.xsl
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	check_hasreginfo.xsl
+
+	Check that an entity has a RegistrationInfo element.
+	
+-->
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+	<!--
+		Common support functions.
+	-->
+	<xsl:import href="check_framework.xsl"/>
+	
+	<xsl:template match="md:EntityDescriptor[not(md:Extensions/mdrpi:RegistrationInfo)]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">entity does not have an mdrpi:RegistrationInfo element</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+</xsl:stylesheet>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 7cdefe35..aaa01b69 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -73,11 +73,11 @@
         class="net.shibboleth.metadata.dom.XSLTransformationStage"/>
     
     <!--
-        check_xslt_parent
+        XSLValidationStage / check_xslt_parent
         
         Parent for XSLT-based checking stages.
     -->
-    <bean id="check_xslt_parent" abstract="true" parent="stage_parent"
+    <bean id="XSLValidationStage" name="check_xslt_parent" abstract="true" parent="stage_parent"
         class="net.shibboleth.metadata.dom.XSLValidationStage"/>
     
     <!--
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 4cfa5aed..adb88d64 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -367,6 +367,18 @@
         </property>
     </bean>
     
+    <!--
+        check_hasreginfo
+        
+        Check that each entity has an mdrpi:RegistrationInfo element.
+    -->
+    <bean id="check_hasreginfo" parent="XSLValidationStage"
+        p:id="check_hasreginfo">
+        <property name="xslResource">
+            <bean parent="FilesystemResource" c:resourcePath="#{ systemProperties['rulesdir'] }/check_hasreginfo.xsl"/>
+        </property>
+    </bean>
+    
     <!--
         ***********************************************
         ***                                         ***