diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
new file mode 100644
index 00000000..5f761fcf
--- /dev/null
+++ b/mdx/gr_grnet/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="gr_grnet_productionAggregate" class="net.shibboleth.metadata.dom.DomHttpSourceStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="gr_grnet_productionAggregate"/>
+        <property name="parserPool" ref="parserPool"/>
+        <property name="sourceUrl" value="http://aai.grnet.gr/metadata.xml"/>        
+    </bean>
+    
+    <!--
+        Signing certificate.
+    -->
+    <bean id="gr_grnet_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/gr_grnet/wayf.grnet.gr.pem"/>
+            </bean>
+        </property>
+    </bean>
+    
+    <!--
+        Check signing signature.
+    -->
+    <bean id="gr_grnet_checkSignature" class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="gr_grnet_checkSignature"/>
+        <property name="verificationCertificate" ref="gr_grnet_signingCertificate"/>
+    </bean>
+    
+    <!--
+        Fetch and process the exported entities as a collection.
+    -->
+    <bean id="gr_grnet_exportedEntities" class="net.shibboleth.metadata.pipeline.CompositeStage"
+        init-method="initialize" lazy-init="true">
+        <property name="id" value="gr_grnet_exportedEntities"/>
+        <property name="composedStages">
+            <list>
+                <!-- no export aggregate; use the production one instead -->
+                <ref bean="gr_grnet_productionAggregate"/>
+                <ref bean="gr_grnet_checkSignature"/>
+                
+                <!-- failure to validate signature is fatal -->
+                <ref bean="errorTerminatingFilter"/>
+                
+                <ref bean="disassemble"/>
+                
+                <ref bean="standardImportActions"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/gr_grnet/verbs.xml b/mdx/gr_grnet/verbs.xml
new file mode 100644
index 00000000..b10de8ee
--- /dev/null
+++ b/mdx/gr_grnet/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/gr_grnet/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="gr_grnet_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="gr_grnet_productionAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
diff --git a/mdx/gr_grnet/wayf.grnet.gr.pem b/mdx/gr_grnet/wayf.grnet.gr.pem
new file mode 100644
index 00000000..f44763a9
--- /dev/null
+++ b/mdx/gr_grnet/wayf.grnet.gr.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIQJ3b7gyaiMj/m8Kdb1zP9JDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIxNjAwMDAwMFoXDTEzMDIxNTIzNTk1OVowgZAxCzAJBgNV
+BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
+ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEXMBUGA1UE
+CxMOQUFJIEZlZGVyYXRpb24xFjAUBgNVBAMTDXdheWYuZ3JuZXQuZ3IwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRKMaXmXHaUbrKf6hr3UXw+j5fwNKY
+tdf5+KrHJ6hi6n4AOgB9W8jLzdSdApy1EvPbNDdqkdVh/un3Ix4BdZAXWxtG5J0d
+O6iUcO+bylT8TKIMh5TGJvDeMhXAJeicSteIff/D8MhQNWLc+UTAQrL4pWozVWgz
+9eZhguL8GjkzYZJsH+/Kl+uz1+xD1Ah2N1b55zn9xIaey6ddk+5zq1BXTJeGCprO
+GyT1z+8wi+yFCqWwzzkukePQ5t6LKd+Nx24q/hkAp0qK9e0TlKMZ6sTXKYE6hgMe
+S1Qx22YYHnmZE3IowvkNGJS3EH8QzlhXv+Q2vwlq7J2Fj7rIT95InxkbAgMBAAGj
+ggGTMIIBjzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
+FgQUIM5mpKolyXyomqjCDer9F5WEkJ0wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
+/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
+DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
+AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwSwYDVR0R
+BEQwQoINd2F5Zi5ncm5ldC5ncoIMYWFpLmdybmV0LmdyghB3d3cuYWFpLmdybmV0
+LmdyghF3d3cud2F5Zi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAFoQDRmSi
+v0C3EeMhUKCm6RHP6uYmtAQY6K28Z+cne51oNqMV/EkZV3eVkdnnubAolJz9eXWO
+KOfWa2PemYbWxoun3Dvun8JBxxQcG8kv0xMnsaJ66NlKoe+KMDWIt2NRHhuTT+1k
+KvjDAQqGMpGwtDeOrSaoi9tjcjGfwhGVxWMAA1rD6JUtTCz428FTWwMw+QVAdTm5
+zvox3GLmsR4BGT9JJQYolP3KYNhb9x1esMz/Df4YVLuBHj/QrjJdhRMN9uszFED5
+CSbf6c1/uGE3NTT5m0duNaZUEB8vBUtIWAmJTSomK2PTlIZsYj6bEsmb2Y5VHgmX
+ol0rGAMQaUVeww==
+-----END CERTIFICATE-----