https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-1.0

13 files changed, 437 insertions, 39 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 0e140177..c1e73660 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-01-24T12:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-03-09T14:17:02Z" cacheDuration="PT345600S">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/auth.asiaportal.info.xml b/swamid-interfederations-1.0/auth.asiaportal.info.xml
index 8efcf4b4..185c51f5 100644
--- a/swamid-interfederations-1.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-1.0/auth.asiaportal.info.xml
@@ -15,9 +15,9 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.asiaportal.info/simplesaml/saml2/sp/SingleLogoutService.php"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">AsiaPortal – NIAS</md:ServiceName>
       <md:ServiceName xml:lang="da">AsiaPortal – NIAS</md:ServiceName>
diff --git a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
index d75aeb63..c4e60ff7 100644
--- a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
@@ -6,11 +6,12 @@
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
-        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
         <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
+        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
         <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
@@ -18,8 +19,8 @@
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
       </mdui:DiscoHints>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 023a2437..d1484c93 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -27,6 +27,7 @@
       <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bardu.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">berlevag.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bi.no</shibmd:Scope>
@@ -184,6 +185,7 @@
       <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">karasjok.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karlsoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
       <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
       <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
@@ -193,6 +195,7 @@
       <shibmd:Scope regexp="false">kongsvinger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvafjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kvanangen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
@@ -210,6 +213,7 @@
       <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">loppa.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">loten.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
@@ -244,6 +248,7 @@
       <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nissedal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
@@ -270,6 +275,7 @@
       <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">porsanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ralingen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
@@ -290,6 +296,7 @@
       <shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sami.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samisk.vgs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
@@ -310,7 +317,6 @@
       <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skoler.loppa.no</shibmd:Scope>
       <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
index ccf8a029..3c2462a8 100644
--- a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
@@ -11,31 +11,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
-MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
-ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
-9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
-ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
-H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
-qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
-gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
-j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
-A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
-LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
-aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
-AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
-T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
-K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
-Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
-Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEkTCCA3mgAwIBAgIRAOvPb9GQ1sEnxj0afzGU0O8wDQYJKoZIhvcNAQELBQAw
 ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
 CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
diff --git a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
index 7952bc6c..b61bcb7f 100644
--- a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
@@ -4,19 +4,20 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
         <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
-        <mdui:Logo height="300" width="300">https://www.tut.fi/TTY_ratas.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
+        <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
         <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
         <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
       </mdui:UIInfo>
       <mdui:DiscoHints>
-        <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
         <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
+        <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
         <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
         <mdui:IPHint>193.167.88.0/21</mdui:IPHint>
         <mdui:DomainHint>tut.fi</mdui:DomainHint>
diff --git a/swamid-interfederations-1.0/secure.huygens.knaw.nl.xml b/swamid-interfederations-1.0/secure.huygens.knaw.nl.xml
new file mode 100644
index 00000000..5471d360
--- /dev/null
+++ b/swamid-interfederations-1.0/secure.huygens.knaw.nl.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://secure.huygens.knaw.nl">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Huygens ING (CLARIN)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Huygens ING (CLARIN services)</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessä CLARIN aloitteen.</mdui:Description>
+        <mdui:Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="3" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Huygens ING (CLARIN)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Huygens ING (CLARIN services)</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessa CLARIN aloitteen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:SurName>Huygens ING (KNAW)</md:SurName>
+    <md:EmailAddress>mailto:sso@huygens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Support</md:GivenName>
+    <md:SurName>Huygens ING (KNAW)</md:SurName>
+    <md:EmailAddress>mailto:sso@huygens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..c6cc9bf5
--- /dev/null
+++ b/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.uta.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">uta.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQWJ0Uu68P2AMpFdKpOgOPRDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxMTAwMDAwMFoXDTE3MDEwODIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFzaGliYm9sZXRo
+LnV0YS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdw/yo3Lbk+
+jpCHDDZ4M3At6zmkcEjMXmoyIEf/JtrdS7jictu5JbtdBq2tF1pghbwam0OoebBt
+JOeMhA5kRT8L4A7q75SlOAgLOGn8pF+Nmzeh4GMdUM0bNMQU35yuVv2mqzoWk2bf
+gfzHaUPyClu1YYus09CXCqDTKYzzWdSOLLm/Gwh2hcq93sdQnG2bnL5VB7Aranw5
+Jxp7Lr1cGv8TLVh/UxusZAY230Tg2E9J2MiHtiXBC6zIVWMFqH46xVLpaEj5qq83
+y0CDtUuTg9iNOnujnBW0p0c0ncHWo1J1NN3KQNep8qBRlXeDfpYd0tyQXElsLHwA
+CFMRl0Qb0t0CAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBQHZ33wMzTaJ63+SHUEjeM0I81mBzAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRc2hpYmJvbGV0aC51dGEuZmkw
+DQYJKoZIhvcNAQEFBQADggEBAImCKMUf2qlnocIu68mg7acEc+Wqbjmkg/Y0NEUr
+esosCNMWkyWrvugRL2sXJ2JKOlzn3ivS5V7d2KbAOWIaX3WURTCoinUMjXoKu7av
+1rHxYbexNPEcZZWlpzP9POTFQsKkMn8skqOADHTawOnTrQ8mAf9w93E0MuEzArCN
+WZxb93Oky2XoDssu7YLnMurBAq5odfc+UEN4xAiKHOrIRYlswcQq9s6GVMO6GX5L
+fK2v/tIcR6ODF7srxhs3AMZchoWljFoWBl+ZZwuyN7Sioh+5gRaFT9DhTaWw0WxM
+JFOZQrlkdonIfIBEIk8JTF6Wg6Hp6dr33wBB7xapJqAhTjM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uta.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uta.fi/idp/profile/Shibboleth/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">uta.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQWJ0Uu68P2AMpFdKpOgOPRDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxMTAwMDAwMFoXDTE3MDEwODIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFzaGliYm9sZXRo
+LnV0YS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdw/yo3Lbk+
+jpCHDDZ4M3At6zmkcEjMXmoyIEf/JtrdS7jictu5JbtdBq2tF1pghbwam0OoebBt
+JOeMhA5kRT8L4A7q75SlOAgLOGn8pF+Nmzeh4GMdUM0bNMQU35yuVv2mqzoWk2bf
+gfzHaUPyClu1YYus09CXCqDTKYzzWdSOLLm/Gwh2hcq93sdQnG2bnL5VB7Aranw5
+Jxp7Lr1cGv8TLVh/UxusZAY230Tg2E9J2MiHtiXBC6zIVWMFqH46xVLpaEj5qq83
+y0CDtUuTg9iNOnujnBW0p0c0ncHWo1J1NN3KQNep8qBRlXeDfpYd0tyQXElsLHwA
+CFMRl0Qb0t0CAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBQHZ33wMzTaJ63+SHUEjeM0I81mBzAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRc2hpYmJvbGV0aC51dGEuZmkw
+DQYJKoZIhvcNAQEFBQADggEBAImCKMUf2qlnocIu68mg7acEc+Wqbjmkg/Y0NEUr
+esosCNMWkyWrvugRL2sXJ2JKOlzn3ivS5V7d2KbAOWIaX3WURTCoinUMjXoKu7av
+1rHxYbexNPEcZZWlpzP9POTFQsKkMn8skqOADHTawOnTrQ8mAf9w93E0MuEzArCN
+WZxb93Oky2XoDssu7YLnMurBAq5odfc+UEN4xAiKHOrIRYlswcQq9s6GVMO6GX5L
+fK2v/tIcR6ODF7srxhs3AMZchoWljFoWBl+ZZwuyN7Sioh+5gRaFT9DhTaWw0WxM
+JFOZQrlkdonIfIBEIk8JTF6Wg6Hp6dr33wBB7xapJqAhTjM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uta.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Tampereen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Tampere</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tampereen yliopisto</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Tampereen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Tampere</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tampereen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uta.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uta.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uta.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Leena</md:GivenName>
+    <md:SurName>Heino</md:SurName>
+    <md:EmailAddress>mailto:haka@uta.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
index 7b50bdbc..979f5b29 100644
--- a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
@@ -4,9 +4,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml
index 948f5f71..6261ab0f 100644
--- a/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -33,4 +33,15 @@
       <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Technical University of Denmark</md:OrganizationName>
+    <md:OrganizationName xml:lang="da">Danmarks Tekniske Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technical University of Denmark</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="da">Danmarks Tekniske Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="da">http://www.dtu.dk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>tato@dtu.dk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml b/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
new file mode 100644
index 00000000..901dbec1
--- /dev/null
+++ b/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://urn.nbi.ku.dk/saml/sp/wayf">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICsDCCAZgCCQC/WydSa4uKBDANBgkqhkiG9w0BAQUFADAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswHhcNMTQxMTA1MTE0MTU1WhcNMjQxMTA0MTE0MTU1WjAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA7kWkLsBYJAKgCdKhSBN/t7gDN3CzmPB31X5Zzs8BUKD7y4MAw89xsxgE2D1efiTkO+yL20Buy4V7LWo3sbdkrnoOl8jWXITM/2AiubUla+3z+ZY0DtSPFeMhkGE65ATXtU6UaaEsGzrXxmS1vQXeGNOVbWYFSIASXKoUxyGEPuXl48ndJorQzHsNePSfppcExDLtpr5Rr66PM2LiZstA1jZY5zE7Dn30SVZegiKEK/yQNILVr77Dk/aYxZlxYqMt1DRbrPmweCYo1HeL8TUEvAKENb/t9lsO7tTsqjoJcHOssmiMiNrMmfHL590/B/SecGzO8Owt+7VRUWoD2R9RAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACpR0e4SuFcLPgr0yGvDTTvRm+aiztxVc0eBbYygLcBDiyQKDnYwTTXrNYkCo9fKV2JEBbiVMTZOotxYXUZy/bvdmaZtXsYNkE3+G22zEa+DhrlUUnSjy0d49agQqm/ABrnmy7Zj7cKiRwu+UVusghFANNAx51VmL1tufQQLTYgjFpSH6L8HYOnk+4+zPX1NXStYVbuAEmnJy33JJbWIZP6RqSsEtfrpN8iW/uyNtgW5ptbU9/HaeeRMlj3gm/RUUs507JSFk4/w1PzSqjzn5DTQq1hBcWOawXd0ER7AS0f1keV6SFUplw8kXnKlxb8EAU5/S1jjSKrSSBoptF/VDYA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICsDCCAZgCCQC/WydSa4uKBDANBgkqhkiG9w0BAQUFADAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswHhcNMTQxMTA1MTE0MTU1WhcNMjQxMTA0MTE0MTU1WjAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA7kWkLsBYJAKgCdKhSBN/t7gDN3CzmPB31X5Zzs8BUKD7y4MAw89xsxgE2D1efiTkO+yL20Buy4V7LWo3sbdkrnoOl8jWXITM/2AiubUla+3z+ZY0DtSPFeMhkGE65ATXtU6UaaEsGzrXxmS1vQXeGNOVbWYFSIASXKoUxyGEPuXl48ndJorQzHsNePSfppcExDLtpr5Rr66PM2LiZstA1jZY5zE7Dn30SVZegiKEK/yQNILVr77Dk/aYxZlxYqMt1DRbrPmweCYo1HeL8TUEvAKENb/t9lsO7tTsqjoJcHOssmiMiNrMmfHL590/B/SecGzO8Owt+7VRUWoD2R9RAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACpR0e4SuFcLPgr0yGvDTTvRm+aiztxVc0eBbYygLcBDiyQKDnYwTTXrNYkCo9fKV2JEBbiVMTZOotxYXUZy/bvdmaZtXsYNkE3+G22zEa+DhrlUUnSjy0d49agQqm/ABrnmy7Zj7cKiRwu+UVusghFANNAx51VmL1tufQQLTYgjFpSH6L8HYOnk+4+zPX1NXStYVbuAEmnJy33JJbWIZP6RqSsEtfrpN8iW/uyNtgW5ptbU9/HaeeRMlj3gm/RUUs507JSFk4/w1PzSqjzn5DTQq1hBcWOawXd0ER7AS0f1keV6SFUplw8kXnKlxb8EAU5/S1jjSKrSSBoptF/VDYA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.nbi.ku.dk/wayf/sp/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.nbi.ku.dk/wayf/sp/postResponse" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NBI Application Server</md:ServiceName>
+      <md:ServiceName xml:lang="da">NBI's Applikationsserver</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide access to NBI web services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til NBI-tjenester</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 22db59c3..b9666602 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -149,6 +149,7 @@
       <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
       <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">itcn.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosunord.dk</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml b/swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
new file mode 100644
index 00000000..3d8e4e57
--- /dev/null
+++ b/swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This SP regulates access to the Meertens Institute Archive and selected services for humanities research in the domain of Dutch</mdui:Description>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyä Meertens instituutin arkisto ja asiantuntijapalvelut humanististen tutkimustoiminnan ...</mdui:Description>
+        <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities archive</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">Meertens tutkimus asiakirjat kieli kulttuuri humanististen arkisto</mdui:Keywords>
+        <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>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</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN-NL Meertens instituutin</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN-NL Meertens Institute</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc</md:GivenName>
+    <md:SurName>Kemps-Snijders</md:SurName>
+    <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>