diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
new file mode 100644
index 00000000..cc15d4bd
--- /dev/null
+++ b/mdx/nl_surfnet/beans.xml
@@ -0,0 +1,45 @@
+<?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 IdP aggregate.
+    -->
+    <bean id="nl_surfnet_idpAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="nl_surfnet_idpAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="http://federatie.surfnet.nl/metadata-sfs-idp-saml20-signed.xml"/>        
+    </bean>
+    
+    <!--
+        Fetch the SP aggregate.
+    -->
+    <bean id="nl_surfnet_spAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="nl_surfnet_spAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="http://federatie.surfnet.nl/metadata-sfs-sp-saml20-signed.xml"/>        
+    </bean>
+    
+    <!--
+        Fetch and process the exported entities as a collection.
+    -->
+    <bean id="nl_surfnet_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="nl_surfnet_exportedEntities"/>
+        <property name="composedStages">
+            <list>
+                <!-- no export aggregate; use the production ones instead -->
+                <ref bean="nl_surfnet_idpAggregate"/>
+                <ref bean="nl_surfnet_spAggregate"/>
+                <ref bean="cleanImport"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/nl_surfnet/verbs.xml b/mdx/nl_surfnet/verbs.xml
new file mode 100644
index 00000000..314f56ac
--- /dev/null
+++ b/mdx/nl_surfnet/verbs.xml
@@ -0,0 +1,60 @@
+<?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/nl_surfnet/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="nl_surfnet_exportedEntities"/>
+                <ref bean="standardImportTail"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+
+    <!--
+        importRaw
+        
+        Fetch the separate IdP and SP aggregates, disassemble them into individual entities
+        and then build up a single aggregate from all combined.
+    -->
+    <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="nl_surfnet_idpAggregate"/>
+                <ref bean="nl_surfnet_spAggregate"/>
+                <ref bean="assemble"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>