diff --git a/mdx/aaf/aaf-beans.xml b/mdx/aaf/aaf-beans.xml
new file mode 100644
index 00000000..ae6311ee
--- /dev/null
+++ b/mdx/aaf/aaf-beans.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Common beans for AAF operations.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" 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-3.0.xsd"> 
+
+    <!--
+        Fetch the AAF export metadata aggregate.  For the moment, use the production aggregate in lieu
+        of a designated export aggregate.
+    -->
+    <bean id="fetchAafExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
+        <property name="id" value="fetchAafExportAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="http://manager.aaf.edu.au/metadata/metadata.aaf.signed.xml"/>        
+    </bean>
+    
+    <!--
+        AAF signing certificate.
+    -->
+    <bean id="aafSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+        <property name="certificateFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/aaf/aaf-metadata-cert.pem"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Check AAF signing signature.
+    -->
+    <bean id="checkAafSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
+        <property name="id" value="checkAafSignature"/>
+        <property name="verificationCertificate" ref="aafSigningCertificate"/>
+        <property name="postProcessFilter">
+            <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/aaf/aaf-import.xml b/mdx/aaf/aaf-import.xml
new file mode 100644
index 00000000..bf4e72db
--- /dev/null
+++ b/mdx/aaf/aaf-import.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Import pipeline for metadata from AAF.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" 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-3.0.xsd"> 
+
+    <!--
+        Import commonly used beans.
+    -->
+    <import resource="../common-beans.xml"/>
+        
+    <!--
+        Import AAF-specific beans.
+    -->
+    <import resource="aaf-beans.xml"/>
+    
+    <bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
+        <property name="id" value="pipeline"/>
+        <property name="stages">
+            <list>
+                <ref bean="fetchAafExportAggregate"/>
+                <ref bean="checkAafSignature"/>
+                <ref bean="cleanImport"/>
+                <ref bean="disassemble"/>
+                <ref bean="checkSchemas"/>
+                <ref bean="assemble"/>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>
+
+</beans>
diff --git a/mdx/aaf/aaf-metadata-cert.pem b/mdx/aaf/aaf-metadata-cert.pem
new file mode 100644
index 00000000..3811d0a6
--- /dev/null
+++ b/mdx/aaf/aaf-metadata-cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIFAzCCA+ugAwIBAgIJAKTt168rubfsMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYDVQQGEwJBVTET
+MBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxJDAiBgNVBAoTG0F1c3RhbGlh
+biBBY2Nlc3MgRmVkZXJhdGlvbjEZMBcGA1UECxMQTWV0YWRhdGEgc2lnbmluZzETMBEGA1UEAxMK
+YWFmLmVkdS5hdTEkMCIGCSqGSIb3DQEJARYVYWRtaW5AbGlzdC5hYWYuZWR1LmF1MB4XDTA5MDYx
+MjA2NTMxM1oXDTE5MDYxMDA2NTMxM1owgbExCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNs
+YW5kMREwDwYDVQQHEwhCcmlzYmFuZTEkMCIGA1UEChMbQXVzdGFsaWFuIEFjY2VzcyBGZWRlcmF0
+aW9uMRkwFwYDVQQLExBNZXRhZGF0YSBzaWduaW5nMRMwEQYDVQQDEwphYWYuZWR1LmF1MSQwIgYJ
+KoZIhvcNAQkBFhVhZG1pbkBsaXN0LmFhZi5lZHUuYXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwwkKIGLLVcSgpmeb9EMnMIyVXAIpc/x3psBJvV2JSXz9doF9HRJWMzAtNrrilxLeA
+guTw9+SkZI9Wnlv0HkIz64iS86EKt0f8VfjNxXKLv5B9QoO75y9uWeLScy1/vNeqBFo3lpx4dA9E
+eTShYKa/8+gwBR4SWD6gPbMGVefgGVnFODF3VmXLKlSBSTtXpbagYA7eNCheR++xdF3VDwOSdtba
+yrSBaLjd28ak0qYfPMg+1Xpczvx4EL/mAyLU3kn8xwUaxUPmfq+SYXtkcYTbzqjvw7B/tyvPU7qh
+TCCdhgryBM1ymuoSc2Rh/t8GyT7dVIuFk1oUFmKM5bo+cC3DAgMBAAGjggEaMIIBFjAdBgNVHQ4E
+FgQUkZgD3tP6bmeRtRkyN3+2Wya3U9YwgeYGA1UdIwSB3jCB24AUkZgD3tP6bmeRtRkyN3+2Wya3
+U9ahgbekgbQwgbExCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC
+cmlzYmFuZTEkMCIGA1UEChMbQXVzdGFsaWFuIEFjY2VzcyBGZWRlcmF0aW9uMRkwFwYDVQQLExBN
+ZXRhZGF0YSBzaWduaW5nMRMwEQYDVQQDEwphYWYuZWR1LmF1MSQwIgYJKoZIhvcNAQkBFhVhZG1p
+bkBsaXN0LmFhZi5lZHUuYXWCCQCk7devK7m37DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4IBAQCoCN5fjBvwhqt11r9Cra4hCgxlB6pEPwr8lc9qinU3tVmf5w4R1ksJ2aroHys6P5zY6sz5
+H6Aw+ZihNFmur6M3FlJW40vp+Jo7GPT0HGDCYgmT2tU1vzy0et+XWIvbxnXdR6iHTXDf/l+Dpkxh
+viYkTxpaabUvf8oQWy49UsDCEY45AGSPMszuPShO3yhIEHGENNgkLjCaBTmitkgl17eTgqX5sRBP
+OmHoBXQLCPDuoTPCqi3b9G+7k9eALAvSab7u2B517z2Ik8X/k/iGysDScwslq5swB8lAuJRKm+k2
+FjaJz1S0gBiSRyiGRDrxVMqJttpbrCG7WD38ntBZJvOc
+-----END CERTIFICATE-----