diff --git a/build.xml b/build.xml
index 1b64f7a..dec8d03 100644
--- a/build.xml
+++ b/build.xml
@@ -278,7 +278,7 @@
     -->
     <property name="tools.dir" value="tools"/>
     <property name="tools.ant" value="${tools.dir}/ant"/>
-    <property name="tools.mda" value="${tools.dir}/aggregator-cli-0.9.2"/>
+    <property name="tools.mda" value="${tools.dir}/mda-distribution-0.10.0"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
     <property name="tools.slacktee" value="${tools.dir}/slacktee"/>
     <property name="tools.xmlsectool" value="${tools.dir}/xmlsectool-3.0.0"/>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index f9092e7..ab22a28 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -22,7 +22,7 @@
     <!--
         Pick up Shibboleth MDA beans.
     -->
-    <import resource="mda-beans.xml"/>
+    <import resource="classpath:net/shibboleth/metadata/beans.xml"/>
 
     <!--
         Pick up UK federation MDA beans.
diff --git a/mdx/mda-beans.xml b/mdx/mda-beans.xml
deleted file mode 100644
index ea59208..0000000
--- a/mdx/mda-beans.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:c="http://www.springframework.org/schema/c"
-    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
-        Shibboleth Metadata Aggregator's aggregator-pipeline artifact.
-
-        All defined bean names are prefixed with "mda.".
-    -->
-
-    <!--
-        Parent for anything based on the Shibboleth component system.
-        These all require initialization before use.
-    -->
-    <bean id="mda.component_parent" abstract="true"
-        init-method="initialize" destroy-method="destroy"/>
-
-    <!--
-        Parent for all stages.
-    -->
-    <bean id="mda.stage_parent" abstract="true" parent="mda.component_parent"/>
-
-    <!--
-        net.shibboleth.metadata
-    -->
-
-    <bean id="mda.DeduplicatingItemIdMergeStrategy" abstract="true"
-        class="net.shibboleth.metadata.DeduplicatingItemIdMergeStrategy"/>
-
-    <bean id="mda.FirstItemIdItemIdentificationStrategy" abstract="true"
-        class="net.shibboleth.metadata.FirstItemIdItemIdentificationStrategy"/>
-
-    <bean id="mda.SimpleCollectionMergeStrategy" abstract="true"
-        class="net.shibboleth.metadata.SimpleCollectionMergeStrategy"/>
-
-    <bean id="mda.SimpleItemCollectionSerializer" abstract="true"
-        class="net.shibboleth.metadata.SimpleItemCollectionSerializer"/>
-
-    <!--
-        net.shibboleth.metadata.dom
-    -->
-
-    <bean id="mda.CRDetectionStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.CRDetectionStage"/>
-
-    <bean id="mda.DOMElementSerializer" abstract="true"
-        class="net.shibboleth.metadata.dom.DOMElementSerializer"/>
-
-    <bean id="mda.DOMFilesystemSourceStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.DOMFilesystemSourceStage"/>
-
-    <bean id="mda.DOMResourceSourceStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.DOMResourceSourceStage"/>
-
-    <bean id="mda.ElementStrippingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.ElementStrippingStage"/>
-
-    <bean id="mda.ElementWhitespaceTrimmingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.ElementWhitespaceTrimmingStage"/>
-
-    <bean id="mda.EmptyContainerStrippingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.EmptyContainerStrippingStage"/>
-
-    <bean id="mda.MultiOutputXSLTransformationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.MultiOutputXSLTransformationStage"/>
-
-    <bean id="mda.NamespacesStrippingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.NamespacesStrippingStage"/>
-
-    <bean id="mda.NamespaceStrippingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.NamespaceStrippingStage"/>
-
-    <bean id="mda.XMLSchemaValidationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.XMLSchemaValidationStage"/>
-
-    <bean id="mda.XMLSignatureSigningStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.XMLSignatureSigningStage"/>
-
-    <bean id="mda.XMLSignatureValidationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"/>
-
-    <bean id="mda.XPathFilteringStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.XPathFilteringStage"/>
-
-    <bean id="mda.XPathItemSelectionStrategy" abstract="true"
-        class="net.shibboleth.metadata.dom.XPathItemSelectionStrategy"/>
-
-    <bean id="mda.XSLTransformationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.XSLTransformationStage"/>
-
-    <bean id="mda.XSLValidationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.XSLValidationStage"/>
-
-    <!--
-        net.shibboleth.metadata.dom.ds
-    -->
-
-    <bean id="mda.X509ValidationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.ds.X509ValidationStage"/>
-
-    <!--
-        net.shibboleth.metadata.dom.saml
-    -->
-
-    <bean id="mda.ContactPersonFilterStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage"/>
-
-    <bean id="mda.EntitiesDescriptorAssemblerStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage"/>
-
-    <bean id="mda.EntitiesDescriptorDisassemblerStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage"/>
-
-    <bean id="mda.EntityDescriptorItemIdPopulationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntityDescriptorItemIdPopulationStage"/>
-
-    <bean id="mda.EntityFilterStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntityFilterStage"/>
-
-    <bean id="mda.EntityRoleFilterStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.EntityRoleFilterStage"/>
-
-    <bean id="mda.GenerateIdStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.GenerateIdStage"/>
-
-    <bean id="mda.PullUpCacheDurationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.PullUpCacheDurationStage"/>
-
-    <bean id="mda.PullUpValidUntilStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.PullUpValidUntilStage"/>
-
-    <bean id="mda.RemoveOrganizationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.RemoveOrganizationStage"/>
-
-    <bean id="mda.SetCacheDurationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.SetCacheDurationStage"/>
-
-    <bean id="mda.SetValidUntilStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.SetValidUntilStage"/>
-
-    <bean id="mda.ValidateValidUntilStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.ValidateValidUntilStage"/>
-
-    <!--
-        net.shibboleth.metadata.dom.saml.mdattr
-    -->
-
-    <bean id="mda.EntityAttributeFilteringStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.mdattr.EntityAttributeFilteringStage"/>
-
-    <bean id="mda.EntityCategoryMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategoryMatcher"/>
-
-    <bean id="mda.EntityCategorySupportMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.EntityCategorySupportMatcher"/>
-
-    <bean id="mda.MultiPredicateMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.MultiPredicateMatcher"/>
-
-    <bean id="mda.RegistrationAuthorityMatcher" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdattr.RegistrationAuthorityMatcher"/>
-
-    <!--
-        net.shibboleth.metadata.dom.saml.mdrpi
-    -->
-
-    <bean id="mda.EntityRegistrationAuthorityFilterStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.mdrpi.EntityRegistrationAuthorityFilterStage"/>
-
-    <bean id="mda.RegistrationAuthorityItemIdentificationStrategy" abstract="true"
-        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityItemIdentificationStrategy"/>
-
-    <bean id="mda.RegistrationAuthorityPopulationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthorityPopulationStage"/>
-
-    <!--
-        net.shibboleth.metadata.pipeline
-    -->
-
-    <bean id="mda.AtLeastCollectionPredicate" abstract="true"
-        class="net.shibboleth.metadata.pipeline.AtLeastCollectionPredicate"/>
-
-    <bean id="mda.CompositeStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.CompositeStage"/>
-
-    <bean id="mda.FilesInDirectoryMultiOutputStrategy" abstract="true" parent="mda.component_parent"
-        class="net.shibboleth.metadata.pipeline.FilesInDirectoryMultiOutputStrategy"/>
-
-    <bean id="mda.ItemIdTransformStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.ItemIdTransformStage"/>
-
-    <bean id="mda.ItemMetadataAddingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.ItemMetadataAddingStage"/>
-
-    <bean id="mda.ItemMetadataFilterStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.ItemMetadataFilterStage"/>
-
-    <bean id="mda.ItemMetadataTerminationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.ItemMetadataTerminationStage"/>
-
-    <bean id="mda.MDQueryMD5ItemIdTransformer" abstract="true"
-        class="net.shibboleth.metadata.pipeline.MDQueryMD5ItemIdTransformer"/>
-
-    <bean id="mda.MDQuerySHA1ItemIdTransformer" abstract="true"
-        class="net.shibboleth.metadata.pipeline.MDQuerySHA1ItemIdTransformer"/>
-
-    <bean id="mda.MultiOutputSerializationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.MultiOutputSerializationStage"/>
-
-    <bean id="mda.PipelineDemultiplexerStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineDemultiplexerStage"/>
-
-    <bean id="mda.PipelineMergeStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.PipelineMergeStage"/>
-
-    <bean id="mda.ScriptletStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.ScriptletStage"/>
-
-    <bean id="mda.SerializationStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.SerializationStage"/>
-
-    <bean id="mda.SimplePipeline" abstract="true" parent="mda.component_parent"
-        class="net.shibboleth.metadata.pipeline.SimplePipeline"/>
-
-    <bean id="mda.SplitMergeStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.SplitMergeStage"/>
-
-    <bean id="mda.StaticItemSourceStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.StaticItemSourceStage"/>
-
-    <bean id="mda.StatusMetadataLoggingStage" abstract="true" parent="mda.stage_parent"
-        class="net.shibboleth.metadata.pipeline.StatusMetadataLoggingStage"/>
-
-    <!--
-        net.shibboleth.metadata.util
-    -->
-
-    <bean id="mda.PathSegmentStringTransformer" abstract="true"
-        class="net.shibboleth.metadata.util.PathSegmentStringTransformer"/>
-
-    <bean id="mda.SHA1StringTransformer" abstract="true"
-        class="net.shibboleth.metadata.util.SHA1StringTransformer"/>
-
-    <!--
-        net.shibboleth.metadata.validate
-    -->
-
-    <bean id="mda.validator_parent" abstract="true" parent="mda.component_parent"/>
-
-    <!--
-        net.shibboleth.metadata.validate.x509
-    -->
-
-    <bean id="mda.X509RSAExponentValidator" abstract="true" parent="mda.validator_parent"
-        class="net.shibboleth.metadata.validate.x509.X509RSAExponentValidator"/>
-
-    <bean id="mda.X509RSAKeyLengthValidator" abstract="true" parent="mda.validator_parent"
-        class="net.shibboleth.metadata.validate.x509.X509RSAKeyLengthValidator"/>
-
-    <bean id="mda.X509RSAOpenSSLBlacklistValidator" abstract="true" parent="mda.validator_parent"
-        class="net.shibboleth.metadata.validate.x509.X509RSAOpenSSLBlacklistValidator"/>
-
-</beans>