diff --git a/build.xml b/build.xml
index ff8ff0f1..aab95c42 100644
--- a/build.xml
+++ b/build.xml
@@ -1151,6 +1151,10 @@
         <CHANNEL.import channel="es_sir"/>
     </target>
 
+    <target name="flow.fi_haka.import">
+        <CHANNEL.import channel="fi_haka"/>
+    </target>
+
     <target name="flow.fr_renater.import">
         <CHANNEL.import channel="fr_renater"/>
     </target>
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
new file mode 100644
index 00000000..c4c40790
--- /dev/null
+++ b/mdx/fi_haka/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="fi_haka_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="fi_haka_productionAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="https://haka.funet.fi/metadata/haka-metadata.xml"/>        
+    </bean>
+    
+    <!--
+        Signing certificate.
+    -->
+    <bean id="fi_haka_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/fi_haka/haka-sign.csc.fi.pem"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Check signing signature.
+    -->
+    <bean id="fi_haka_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="fi_haka_checkSignature"/>
+        <property name="verificationCertificate" ref="fi_haka_signingCertificate"/>
+    </bean>
+    
+    <!--
+        Fetch and process the exported entities as a collection.
+    -->
+    <bean id="fi_haka_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="fi_haka_exportedEntities"/>
+        <property name="composedStages">
+            <list>
+                <!-- no export aggregate; use the production one instead -->
+                <ref bean="fi_haka_productionAggregate"/>
+                <ref bean="fi_haka_checkSignature"/>
+                
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/fi_haka/haka-sign.csc.fi.pem b/mdx/fi_haka/haka-sign.csc.fi.pem
new file mode 100644
index 00000000..e7c6c25d
--- /dev/null
+++ b/mdx/fi_haka/haka-sign.csc.fi.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEyTCCA7GgAwIBAgIQS8Cuc3r7FkAxoLWu5h48mTANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQG
+EwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDYxODAw
+MDAwMFoXDTEyMDYxNjIzNTk1OVowgaMxCzAJBgNVBAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4G
+A1UECBMHRmlubGFuZDEOMAwGA1UEBxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxLzAt
+BgNVBAoTJkNTQyAtIFRpZXRlZW4gdGlldG90ZWtuaWlrYW4ga2Vza3VzIE95MRkwFwYDVQQDExBo
+YWthLXNpZ24uY3NjLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuQYgZRXj6juW
+6k0gtuFOznaHERzb3xVFEuTzyGFgIjHnlemmAWmIznRsOJEO4ip/2tUTbrKGVUVjT3vsZKD7pAZ4
+W1IsQ5Zy+hfJO5SBln5oxEuUk9Zc6kae5lf3FEXXnn8nj45Maxly7fbaVizBwn3Qyw+V6RkYa+/T
+welzqGabl7hcpBlkFwL2I5FjOm6y8EZFqpIhFR6QsY6pTo3mCXxqn0n5MPCV4Iq14qzOq/ilLBX+
+WpdfeMn0GtLF2tx5dWH9jrSqkxCpN+JPg4eaWDbcoG5cdjlh1EIFTVDp0AqGMc727EK5HkvTBSlK
+0VGcXtfAPnku927XwlEP+Orc4QIDAQABo4IBYzCCAV8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFPjFf/pOphrUURKdUb2NATpQuViKMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBsGA1UdEQQUMBKCEGhha2Etc2lnbi5jc2MuZmkwDQYJKoZIhvcNAQEFBQAD
+ggEBALeJQkiNnjxdcH4jJ3e54FNRATndG/dwY8jxRW1dNms4lERA+GYq3UR8XVUH8TF1BmBolJD7
+dEp6mWX0pPDlUCBrWVETpQgiW8lJkvJAsRmSz8II34HvjVglOM+M1bKC7+9PE/OKXgoktliy9hB5
+NZGuSfsjdGkNCCtjk+svaC3fWxDX/58JKzCIK7zCMScUedmzjzp/Nx/ltkJ+uLMRBR4zNdlzDqqp
+uZAlHpga2mMnvXGRTGgFYHLZXBmnY0+wjeR/cI6OCvswlRqxUpcfKvdDiBoOdIgSByJUA2Nc2vsX
+APIdUExyF419B2g/ELoigqfZ5qI3lwx9kcZdW9rXt9E=
+-----END CERTIFICATE-----
diff --git a/mdx/fi_haka/verbs.xml b/mdx/fi_haka/verbs.xml
new file mode 100644
index 00000000..6c723ade
--- /dev/null
+++ b/mdx/fi_haka/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/fi_haka/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="fi_haka_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="fi_haka_productionAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>