diff --git a/build.xml b/build.xml
index d4833afd..c30c7271 100644
--- a/build.xml
+++ b/build.xml
@@ -1147,6 +1147,10 @@
 		<CHANNEL.import channel="cz_eduid"/>
 	</target>
 
+    <target name="flow.de_dfnaai.import">
+        <CHANNEL.import channel="de_dfnaai"/>
+    </target>
+
     <target name="flow.es_sir.import">
         <CHANNEL.import channel="es_sir"/>
     </target>
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
new file mode 100644
index 00000000..64a9b7cd
--- /dev/null
+++ b/mdx/de_dfnaai/beans.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Common beans for this channel.
+-->
+<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 production aggregate.
+    -->
+    <bean id="de_dfnaai_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="de_dfnaai_productionAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="https://www.aai.dfn.de/fileadmin/metadata/DFN-AAI-metadata.xml"/>        
+    </bean>
+    
+    <!--
+        Signing certificate.
+    -->
+    <bean id="de_dfnaai_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"
+        lazy-init="true">
+        <property name="certificateFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/de_dfnaai/dfn-aai.pem"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Check signing signature.
+    -->
+    <bean id="de_dfnaai_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="de_dfnaai_checkSignature"/>
+        <property name="verificationCertificate" ref="de_dfnaai_signingCertificate"/>
+    </bean>
+    
+    <!--
+        Fetch and process the exported entities as a collection.
+    -->
+    <bean id="de_dfnaai_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="de_dfnaai_exportedEntities"/>
+        <property name="composedStages">
+            <list>
+                <!-- no export aggregate; use the production one instead -->
+                <ref bean="de_dfnaai_productionAggregate"/>
+                <ref bean="de_dfnaai_checkSignature"/>
+                
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/de_dfnaai/dfn-aai.pem b/mdx/de_dfnaai/dfn-aai.pem
new file mode 100644
index 00000000..9e04258e
--- /dev/null
+++ b/mdx/de_dfnaai/dfn-aai.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFKDCCBBCgAwIBAgIEEct7ZDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
+ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMTA0MTgwOTAx
+MDhaFw0xNDA0MTcwOTAxMDhaMGMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
+VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMSQwIgYDVQQDExtHUlA6
+IERGTi1BQUkgTWV0YWRhdGFzaWduZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDVEX8V4HsOcoq9BVpxV1+0d46prNNJm3+Ya6eJv0T5tIN3iL5hnFh8
+sNy96dVJMoBlM4S5T2O+IVwoD/ookDsU8Tt58baQOwkJnboaLVRmnY/cX0SXg6eX
+/m/ctbLBzZ2zc0Ib4cV2zsrU+CgIisvefFfAZotGGXlpWxk1L5w7mCsDJvynkai6
+qB95lRlnfTefnq71Oc3UNilOtGAsUF/06oZeK48QCQnbT7cbknhKT0p/8zD0zU6E
+lxvx6g2yzJ/lPMnPMzDRSm8znh+Mgtc6G2eSHbWSDY2+8k3PGI02CxV+VLp9w9iY
+K6HUTKdyksnf9MjbryFcs7l6X4ZHT/DhAgMBAAGjggHnMIIB4zAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DApBgNVHSUEIjAgBggrBgEFBQcDAgYIKwYBBQUHAwQGCisG
+AQQBgjcUAgIwHQYDVR0OBBYEFA7xiVpog9MQwaVpDKOwXWz6gENQMB8GA1UdIwQY
+MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMB0GA1UdEQQWMBSBEmhvdGxpbmVAYWFp
+LmRmbi5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+ZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAFpbre9MSQRUN/7dAc+ethRO+rO5xwGMSqbYD8m92bgMLPgzv
+5z0KmzwH33RcoPdAIJlKogIhkoed7iST3oinJcQxCXOW7zmNTHZ5r4hqIJFQKavI
+sCoRWygH6BaYw/Y0Kel8CS3mBRczGu/hjCXw9vOK6MwKB8M1OS/9GPLO6X7Xp6L1
+nEaj4ykWwCcEeTbxD9cZNhVF8OV5ia1sb9hjzZJ2HglKiikPRA3tYtdu8LRF11IV
+1qFywvvJws02Y2qpmNXwLBIphUhgS1x2MFyUi7p7SfawXMzfNBkIEhlkYDbtdHq2
+UoMxvd1UlzTRIG0AxS/rM7LMeKLUV2tDQwG4WA==
+-----END CERTIFICATE-----
diff --git a/mdx/de_dfnaai/verbs.xml b/mdx/de_dfnaai/verbs.xml
new file mode 100644
index 00000000..f957cd65
--- /dev/null
+++ b/mdx/de_dfnaai/verbs.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Verb definitions for this channel.
+-->
+<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 channel-specific beans.
+    -->
+    <import resource="beans.xml"/>
+    
+    <bean id="serializeImported" class="net.shibboleth.metadata.pipeline.SerializationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="serializeImported"/>
+        <property name="serializer" ref="serializer"/>
+        <property name="outputFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/de_dfnaai/imported.xml"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <bean id="import" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="import"/>
+        <property name="stages">
+            <list>
+                <ref bean="de_dfnaai_exportedEntities"/>
+                <ref bean="standardImportTail"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="importRaw" class="net.shibboleth.metadata.pipeline.SimplePipeline"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="importRaw"/>
+        <property name="stages">
+            <list>
+                <ref bean="de_dfnaai_productionAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>