diff --git a/build.xml b/build.xml
index 19203ef6..6716c5fd 100644
--- a/build.xml
+++ b/build.xml
@@ -838,16 +838,6 @@
 		<CHANNEL.do channel="uk" verb="import.metadata"/>
 		<echo>Imported metadata to ${entities.dir}/imported.xml</echo>
         <fixcrlf file="${entities.dir}/imported.xml"/>
-        <XALAN
-            i="${entities.dir}/imported.xml"
-            o="${xml.dir}/embedded.pem"
-            x="${build.dir}/extract_embedded.xsl"/>
-		<echo>Certificates extracted to "${xml.dir}/embedded.pem"</echo>
-        <exec executable="perl" dir="${xml.dir}"
-            input="${xml.dir}/embedded.pem">
-            <arg value="${build.dir}/check_embedded.pl"/>
-        	<arg value="-q"/>
-        </exec>
 	</target>
 	
     <!--
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 4f36ca1b..da85830a 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -206,6 +206,11 @@
     <bean id="ElementWhitespaceTrimmingStage" abstract="true" parent="stage_parent"
         class="uk.org.ukfederation.mda.dom.ElementWhitespaceTrimmingStage"/>
     
+    <bean id="X509CertificateValidationStage" abstract="true" parent="stage_parent"
+        class="uk.org.ukfederation.mda.validate.X509CertificateValidationStage"/>
+
+    <bean id="X509CertificateRSAKeyLengthValidator" abstract="true"
+        class="uk.org.ukfederation.mda.validate.X509CertificateRSAKeyLengthValidator"/>
     
     
     <!--
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 031a9488..fb591e39 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -171,6 +171,17 @@
                 <ref bean="uk_populateIds"/>
                 <ref bean="populateRegistrationAuthorities"/>
                 
+                <bean parent="X509CertificateValidationStage"
+                    p:id="checkCertificates">
+                    <property name="validators">
+                        <list>
+                            <!-- Error on RSA key length less than 2048 bits. -->
+                            <bean parent="X509CertificateRSAKeyLengthValidator"
+                                p:warningBoundary="0" p:errorBoundary="2048"/>
+                        </list>
+                    </property>
+                </bean>
+                
                 <ref bean="check_future"/>
                 <ref bean="errorAnnouncingFilter"/>
             </list>
@@ -200,21 +211,6 @@
         </property>
     </bean>
     
-    <!--
-        fetchImportedMetadata
-        
-        Fetches the contents of the file used to hold metadata just imported
-        by the federation's import transform.
-    -->
-    <bean id="fetchImportedMetadata" parent="DOMFilesystemSourceStage"
-        p:id="fetchImportedMetadata">
-        <property name="source">
-            <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/entities/imported.xml"/>
-            </bean>
-        </property>
-    </bean>
-
     <!--
         serializeImportedMetadata
         
@@ -299,6 +295,17 @@
                 <ref bean="check_shibboleth"/>
                 <ref bean="check_uk_trust"/>
                 
+                <bean parent="X509CertificateValidationStage"
+                    p:id="checkCertificates">
+                    <property name="validators">
+                        <list>
+                            <!-- Error on RSA key length less than 2048 bits. -->
+                            <bean parent="X509CertificateRSAKeyLengthValidator"
+                                p:warningBoundary="0" p:errorBoundary="2048"/>
+                        </list>
+                    </property>
+                </bean>
+                
                 <ref bean="check_uk_mdrps"/>
                 <ref bean="check_uk_urlenc"/>
                 <ref bean="check_future"/>
diff --git a/tools/ukf-mda/ukf-mda-0.8.0.jar b/tools/ukf-mda/ukf-mda-0.8.0.jar
deleted file mode 100644
index 56fb5b11..00000000
Binary files a/tools/ukf-mda/ukf-mda-0.8.0.jar and /dev/null differ
diff --git a/tools/ukf-mda/ukf-mda-0.8.1.jar b/tools/ukf-mda/ukf-mda-0.8.1.jar
new file mode 100644
index 00000000..f1db05c1
Binary files /dev/null and b/tools/ukf-mda/ukf-mda-0.8.1.jar differ