diff --git a/build.xml b/build.xml
index 884af7f9..54f6609e 100644
--- a/build.xml
+++ b/build.xml
@@ -51,7 +51,6 @@
 	<property name="tools.dir" value="tools"/>
 	<property name="tools.ant" value="${tools.dir}/ant"/>
 	<property name="tools.mda" value="${tools.dir}/mda"/>
-	<property name="tools.mdcheck" value="${tools.dir}/mdcheck"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
 	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
 	<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
@@ -776,62 +775,6 @@
 		<echo>Checked.</echo>
 	</target>
 	
-	<!--
-		*****************************************
-		***                                   ***
-		***   M E T A D A T A   C H E C K S   ***
-		***                                   ***
-		*****************************************
-	-->
-
-	<!--
-	    Check a metadata document against a set of conventions.
-	    
-        Parameter 'i' is the file to be checked; no assumption is made
-        about its location so this must contain a full path.
-        
-	    Additional arguments are normally ruleset file names.
-	-->
-	<macrodef name="CHECK.base">
-        <attribute name="i"/>
-        <element name="base.args" implicit="yes"/>
-        <sequential>
-            <java classname="uk.ac.sdss.mdcheck.MetadataCheck"
-                fork="true" failonerror="true" maxmemory="${java.max.memory}">
-                <classpath>
-                    <fileset dir="${tools.mdcheck}/lib">
-                        <include name="*.jar"/>
-                    </fileset>
-                    <fileset dir="${tools.xalan}/lib">
-                        <include name="*.jar"/>
-                    </fileset>
-                </classpath>
-                <jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
-                <arg value="@{i}"/>
-            	<base.args/>
-            </java>
-        </sequential>
-	</macrodef>
-	
-    <!--
-        Check a metadata document against a single ruleset file.
-        
-        Parameter 'i' is the file to be checked; no assumption is made
-        about its location so this must contain a full path.
-        
-        Parameter 's' is the checking stylesheet to use; assumed to be
-        present in the build.dir.
-    -->
-	<macrodef name="CHECK.one">
-        <attribute name="i"/>
-		<attribute name="s"/>
-        <sequential>
-            <CHECK.base i="@{i}">
-                <arg value="${build.dir}/@{s}"/>
-            </CHECK.base>
-        </sequential>
-	</macrodef>
-
     <!--
         *********************************************
         ***                                       ***
@@ -1171,9 +1114,9 @@
 	<!--
 	   Check for IdPs using the single-port configuration.
 	-->
-	<target name="check.ports" depends="flow.uk.collect">
+	<target name="check.ports">
 		<echo>Checking vhost use</echo>
-        <CHECK.one i="${uk.collected}" s="check_vhosts.xsl"/>
+        <CHANNEL.do verb="checkPorts" channel="uk"/>
         <echo>Checked.</echo>
 	</target>
 
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index 4964b14d..e21c801b 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -82,6 +82,38 @@
         </property>
     </bean>
 
+    <!--
+        *********************************
+        ***                           ***
+        ***   C H E C K   P O R T S   ***
+        ***                           ***
+        *********************************
+    -->
+    
+    <bean id="checkPorts" p:id="checkPorts" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="stages">
+            <list>
+                <ref bean="uk_registeredEntities"/>
+                
+                <!--
+                    The next four stages ensure that any errors are reported
+                    in entity ID order, even on systems where the native order
+                    (which tends to reflect the file enumeration ordering)
+                    is arbitrary.  Ideally this should be handled by an optional
+                    ordering strategy on the announcing filter.
+                -->
+                <ref bean="uk_assemble"/>
+                <ref bean="disassemble"/>
+                <ref bean="populateItemIds"/>
+                <ref bean="uk_populateIds"/>
+                
+                <ref bean="check_vhosts"/>
+                <ref bean="errorAnnouncingFilter"/>
+            </list>
+        </property>
+    </bean>
+    
     <!--
         ***********************************
         ***                             ***
diff --git a/tools/mdcheck/lib/sdss-mdcheck-1.3.jar b/tools/mdcheck/lib/sdss-mdcheck-1.3.jar
deleted file mode 100644
index 3553e045..00000000
Binary files a/tools/mdcheck/lib/sdss-mdcheck-1.3.jar and /dev/null differ