diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 40a4fe49..b91f9925 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -27,7 +27,7 @@
     <!--
         Pick up UK federation MDA beans.
     -->
-    <import resource="ukf-beans.xml"/>
+    <import resource="classpath:uk/org/ukfederation/mda/beans.xml"/>
 
     <!--
         ***********************************
diff --git a/mdx/ukf-beans.xml b/mdx/ukf-beans.xml
deleted file mode 100644
index 9c27b3d5..00000000
--- a/mdx/ukf-beans.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-
-    <!--
-        Bean definitions for simplified access to components in the
-        ukf-mda artifact.
-
-        All defined bean names are prefixed with "ukf.".
-    -->
-
-    <!--
-        Parent for anything based on the Shibboleth component system.
-        These all require initialization before use.
-    -->
-    <bean id="ukf.component_parent" abstract="true"
-        init-method="initialize" destroy-method="destroy"/>
-
-    <!--
-        Parent for all stages.
-    -->
-    <bean id="ukf.stage_parent" abstract="true" parent="ukf.component_parent"/>
-
-    <!--
-        uk.org.ukfederation.mda
-    -->
-
-    <bean id="ukf.EntityDescriptorUKIdPopulationStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.EntityDescriptorUKIdPopulationStage"/>
-
-    <bean id="ukf.IdPDisplayNameDuplicateDetectingStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.IdPDisplayNameDuplicateDetectingStage"/>
-
-    <bean id="ukf.RegexFileFilter" abstract="true"
-        class="uk.org.ukfederation.mda.RegexFileFilter"/>
-
-    <bean id="ukf.UKEntityOrderingStrategy" abstract="true"
-        class="uk.org.ukfederation.mda.UKEntityOrderingStrategy"/>
-
-    <bean id="ukf.UKEntitySelectionStrategy" abstract="true"
-        class="uk.org.ukfederation.mda.UKEntitySelectionStrategy"/>
-
-    <bean id="ukf.UKItemIdentificationStrategy" abstract="true"
-        class="uk.org.ukfederation.mda.UKItemIdentificationStrategy"/>
-
-    <!--
-        uk.org.ukfederation.mda.dom
-    -->
-
-    <!--
-        uk.org.ukfederation.mda.dom.saml
-    -->
-
-    <bean id="ukf.EntityOwnerCheckingStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.dom.saml.EntityOwnerCheckingStage"/>
-
-    <bean id="ukf.SAMLStringElementCheckingStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.dom.saml.SAMLStringElementCheckingStage"/>
-
-    <bean id="ukf.ScopeInjectionStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.dom.saml.ScopeInjectionStage"/>
-
-    <!--
-        uk.org.ukfederation.mda.dom.saml.mdattr
-    -->
-
-    <bean id="ukf.EntityAttributeAddingStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.dom.saml.mdattr.EntityAttributeAddingStage"/>
-
-    <!--
-        uk.org.ukfederation.mda.statistics
-    -->
-
-    <bean id="ukf.StatisticsVelocityStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.statistics.StatisticsVelocityStage"/>
-
-    <!--
-        uk.org.ukfederation.mda.validate
-    -->
-
-    <bean id="ukf.X509ConsistentNameValidator" abstract="true" parent="ukf.component_parent"
-        class="uk.org.ukfederation.mda.validate.X509ConsistentNameValidator"/>
-
-    <!--
-        uk.org.ukfederation.mda.validate.mdui
-    -->
-
-    <bean id="ukf.IPHintValidationStage" abstract="true" parent="ukf.stage_parent"
-        class="uk.org.ukfederation.mda.validate.mdui.IPHintValidationStage"/>
-
-</beans>
diff --git a/tools/ukf-mda/ukf-mda-0.9.4.jar b/tools/ukf-mda/ukf-mda-0.9.4.jar
deleted file mode 100644
index 2f7e1a70..00000000
Binary files a/tools/ukf-mda/ukf-mda-0.9.4.jar and /dev/null differ
diff --git a/tools/ukf-mda/ukf-mda-0.9.5.jar b/tools/ukf-mda/ukf-mda-0.9.5.jar
new file mode 100644
index 00000000..de2941e6
Binary files /dev/null and b/tools/ukf-mda/ukf-mda-0.9.5.jar differ