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

19 files changed, 195 insertions, 122 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index c43ea85c..82a272be 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="2014-05-13T12:17:02Z" 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="2014-06-15T06:17:01Z" 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/agw-sparknet.utu.fi.xml b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
index d6a850cd..3e67e901 100644
--- a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
@@ -49,10 +49,10 @@ DSWPf8vQpQ==</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Abo universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Abo universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/filesender.funet.fi.xml b/swamid-interfederations-1.0/filesender.funet.fi.xml
index 89dde5db..da3a3dbe 100644
--- a/swamid-interfederations-1.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-1.0/filesender.funet.fi.xml
@@ -4,14 +4,15 @@
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</mdui:Description>
-        <mdui:Description xml:lang="sv">Funet FileSender erbjuder en lätt och säker sätt att dela stora datafilar till vem som helst.</mdui:Description>
         <mdui:Description xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="sv">Funet FileSender erbjuder en lätt och säker sätt att dela stora datafilar till vem som helst.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</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>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi.xml b/swamid-interfederations-1.0/fse.eduuni.fi.xml
index dcf476aa..40e8b13c 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi.xml
@@ -1,6 +1,21 @@
 <?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://fse.eduuni.fi/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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="http://fse.eduuni.fi/adfs/services/trust">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Eduuni-työtilat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eduuni-workspaces</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Eduuni-työtilat on opetus- ja kulttuuriministeriön toimialan yhteinen sähköisen työskentelyn ja verkostoitumisen alusta.</mdui:Description>
+        <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</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>
diff --git a/swamid-interfederations-1.0/haka.saimia.fi.xml b/swamid-interfederations-1.0/haka.saimia.fi.xml
index ba6287ec..4fd30a12 100644
--- a/swamid-interfederations-1.0/haka.saimia.fi.xml
+++ b/swamid-interfederations-1.0/haka.saimia.fi.xml
@@ -11,32 +11,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAyOgAwIBAgIQG5tFJqoAOg0tfJqHF23wQDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQG
-EwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTExMDUz
-MTEyNDYwNloXDTE0MDUzMDEyNDYwNlowgZsxCzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxMYXBwZWVu
-cmFudGExKzApBgNVBAoMIkV0ZWxhLUthcmphbGFuIGtvdWx1dHVza3VudGF5aHR5bWExLzAtBgNV
-BAsMJlNhaW1hYW4gYW1tYXR0aWtvcmtlYWtvdWx1IElULXBhbHZlbHV0MRcwFQYDVQQDDA5oYWth
-LnNhaW1pYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwog+tZrZLi7m6W7JZq
-ZiLb34PPi3zU76SRx24WWra9Ox8g6CTpdpaHoYC/vZ/XDQMbm2LD56Bey/8+krwx0o/exlPrqCTZ
-2M1A0WegCsqd16oc9+6/XjhWtAgXwLD6sqc0xhy+CCwRhyr9cWBVvvIaBoSkZ93Mjv7POmPruLwN
-fvnpa2gHIWjcSBuvWJmDWsUEtN0HcbfJiiEU1rpGFohkBOES0/bIcEfBNQqA60pdaZVZoWeALE1Y
-bGXc/M8cTXvTYeam24lB7rbso77VthVIocRjwVWU1n70Nw7+byD6lbDq7uFHQLe0q+quKgZiJzUE
-0+sl4YrIsv/NKC3oFr8CAwEAAaOB2zCB2DATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQ
-MA4GDCsGAQQBgg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
-OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
-b2NhdGlvbmxpc3Q7YmluYXJ5MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTAKn7790r6
-rue5HERaCD9UIhaneDANBgkqhkiG9w0BAQUFAAOCAQEAQRcZw/94TbMLV12F00oMZy1dy9A6ds2v
-6Gc7DalfI4d2+0r4D9LTIG9Z4BHXYBiutnBgFPlN9dzzlEmaagARD/zFNgS9ytk9O/CJezSTXdhh
-iznhaKCwr2hx8u6vDCil6WZyIWDSg5kruK2T7e/1QaQOxEsTT5+hgUSIr9aZEa3iSVh+QxfWFlm6
-rxtt3+x31+aDvBWHF2OLR0EkuLYSsVZpB3+vZ26bGQQ1Xkz4zApdNrUgBuPtODNR/gc6mg2qvPxv
-r0N2fY6OHHOJvApQ3LnUu0FGgxC50zQ623Vcyxz8Y5sVbMQVkoSoOW2Yds0hVBXLPZyLrHEuarDE
-urebDA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
 OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
@@ -70,32 +44,6 @@ PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAyOgAwIBAgIQG5tFJqoAOg0tfJqHF23wQDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQG
-EwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTExMDUz
-MTEyNDYwNloXDTE0MDUzMDEyNDYwNlowgZsxCzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxMYXBwZWVu
-cmFudGExKzApBgNVBAoMIkV0ZWxhLUthcmphbGFuIGtvdWx1dHVza3VudGF5aHR5bWExLzAtBgNV
-BAsMJlNhaW1hYW4gYW1tYXR0aWtvcmtlYWtvdWx1IElULXBhbHZlbHV0MRcwFQYDVQQDDA5oYWth
-LnNhaW1pYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwog+tZrZLi7m6W7JZq
-ZiLb34PPi3zU76SRx24WWra9Ox8g6CTpdpaHoYC/vZ/XDQMbm2LD56Bey/8+krwx0o/exlPrqCTZ
-2M1A0WegCsqd16oc9+6/XjhWtAgXwLD6sqc0xhy+CCwRhyr9cWBVvvIaBoSkZ93Mjv7POmPruLwN
-fvnpa2gHIWjcSBuvWJmDWsUEtN0HcbfJiiEU1rpGFohkBOES0/bIcEfBNQqA60pdaZVZoWeALE1Y
-bGXc/M8cTXvTYeam24lB7rbso77VthVIocRjwVWU1n70Nw7+byD6lbDq7uFHQLe0q+quKgZiJzUE
-0+sl4YrIsv/NKC3oFr8CAwEAAaOB2zCB2DATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQ
-MA4GDCsGAQQBgg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
-OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
-b2NhdGlvbmxpc3Q7YmluYXJ5MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTAKn7790r6
-rue5HERaCD9UIhaneDANBgkqhkiG9w0BAQUFAAOCAQEAQRcZw/94TbMLV12F00oMZy1dy9A6ds2v
-6Gc7DalfI4d2+0r4D9LTIG9Z4BHXYBiutnBgFPlN9dzzlEmaagARD/zFNgS9ytk9O/CJezSTXdhh
-iznhaKCwr2hx8u6vDCil6WZyIWDSg5kruK2T7e/1QaQOxEsTT5+hgUSIr9aZEa3iSVh+QxfWFlm6
-rxtt3+x31+aDvBWHF2OLR0EkuLYSsVZpB3+vZ26bGQQ1Xkz4zApdNrUgBuPtODNR/gc6mg2qvPxv
-r0N2fY6OHHOJvApQ3LnUu0FGgxC50zQ623Vcyxz8Y5sVbMQVkoSoOW2Yds0hVBXLPZyLrHEuarDE
-urebDA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
 BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
 OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
@@ -124,10 +72,10 @@ PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Yrkehogskola Saimaa</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Yrkehogskola Saimaa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.saimia.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.saimia.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.saimia.fi</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.abo.fi.xml b/swamid-interfederations-1.0/idp.abo.fi.xml
index 4b24448a..c373b984 100644
--- a/swamid-interfederations-1.0/idp.abo.fi.xml
+++ b/swamid-interfederations-1.0/idp.abo.fi.xml
@@ -42,12 +42,12 @@ eg6LbC2vP3oGU43ehAd8KuMBp3jegA==</ds:X509Certificate>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">Abo Akademi</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Abo Akademi University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Abo Akademi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Abo Akademi</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Abo Akademi University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Abo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index a6ff8c1a..b83f99cc 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -26,6 +26,7 @@
       <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
@@ -86,11 +87,14 @@
       <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
       <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flatanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fosnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
@@ -104,6 +108,7 @@
       <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grane.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
@@ -118,6 +123,7 @@
       <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
@@ -125,6 +131,7 @@
       <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">heroy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
@@ -173,6 +180,7 @@
       <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
@@ -198,6 +206,7 @@
       <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namdalseid.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
@@ -222,6 +231,7 @@
       <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
       <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">overhalla.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
@@ -310,6 +320,7 @@
       <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
       <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
index e3ebf51c..818d2020 100644
--- a/swamid-interfederations-1.0/idp.lapinamk.fi.xml
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
@@ -7,9 +7,9 @@
       <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu testiorganisaatio</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Lapplands YH Testning Organisation</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lapland UAS Testing Organization</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Lapplands YH</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>
@@ -53,10 +53,10 @@ iBFAJu7GLakQ21kx0iJw7Cvw3dG4QswwoiTV55pAx6g=</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Lapin amk</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lapplands Yrkeshogskola</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Lapin amk</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshogskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.lapinamk.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.lapinamk.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.lapinamk.fi</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.metropolia.fi.xml b/swamid-interfederations-1.0/idp.metropolia.fi.xml
index c696283a..0bd93690 100644
--- a/swamid-interfederations-1.0/idp.metropolia.fi.xml
+++ b/swamid-interfederations-1.0/idp.metropolia.fi.xml
@@ -136,10 +136,10 @@ G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Metropolia yrkeshogskola</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Metropolia yrkeshogskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.metropolia.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.metropolia.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.metropolia.fi</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.shh.fi.xml b/swamid-interfederations-1.0/idp.shh.fi.xml
index d41b14a5..4e0db6ad 100644
--- a/swamid-interfederations-1.0/idp.shh.fi.xml
+++ b/swamid-interfederations-1.0/idp.shh.fi.xml
@@ -42,12 +42,12 @@ nAiHebdvpVCIMaM703zAuuDVImHf</ds:X509Certificate>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shh.fi/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">Hanken Svenska handelshogskolan</md:OrganizationName>
+    <md:OrganizationName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Hanken School of Economics</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Hanken Svenska handelshogskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshogskolan</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Hanken School of Economics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshogskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.hanken.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.hanken.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.hanken.fi</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.uef.fi.xml b/swamid-interfederations-1.0/idp.uef.fi.xml
index c39e18ce..4f38e79a 100644
--- a/swamid-interfederations-1.0/idp.uef.fi.xml
+++ b/swamid-interfederations-1.0/idp.uef.fi.xml
@@ -74,12 +74,12 @@ WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certifi
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="fi">Ita-Suomen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ostra Finlands universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Ita-Suomen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Ostra Finlands universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/idp.ulapland.fi.xml b/swamid-interfederations-1.0/idp.ulapland.fi.xml
new file mode 100644
index 00000000..2c4ebebd
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.ulapland.fi.xml
@@ -0,0 +1,87 @@
+<?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://idp.ulapland.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ulapland.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>MIIGrDCCBJSgAwIBAgIQdmrtc4rB3ElPE0L6/94NTjANBgkqhkiG9w0BAQUFADA5
+MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2Vy
+dmVyIENBIHYxMB4XDTE0MDQxNjEwMjQ0N1oXDTE2MDQxNTEwMjQ0N1owgYQxCzAJ
+BgNVBAYTAkZJMRAwDgYDVQQIDAdMYXBsYW5kMRIwEAYDVQQHDAlSb3ZhbmllbWkx
+HjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgTGFwbGFuZDEVMBMGA1UECwwMSUNUIFNl
+cnZpY2VzMRgwFgYDVQQDDA9pZHAudWxhcGxhbmQuZmkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDF4kd9ojVzXalhcDQm+DqVC9DAv+SNYCxSWnhbkms2
+8PPk5cMT6WfHy242QSKYZe2Asbvx856xCxbI+pkEtN7MyeDGu5PmFetwcSj5qaVG
+5spVNoZAgzLKWTzBfmxTT9EjhDioLV2ObqIzR+NTOCvQjfEGKpw9Lg9JobadmUwp
+kDhk1Y3o7ERBnOdyVFfvggl8sUMzU47XJfxk+jlpvOy7x3rQswTTOaGZkgd0OVxC
+awr6HzbBTEu08AiX2nsD3GnqSUPS38/K26a5KGOzFx7j+kT4K+ICBiPTFYgTKgln
+50rIwCn2wYf96vb/Vj6KT/S3WpQ6hVLMie5QA5Zuwl4rAgMBAAGjggJiMIICXjCB
+jQYIKwYBBQUHAQEEgYAwfjAtBggrBgEFBQcwAYYhaHR0cDovL29jc3AudHJ1c3Qu
+dGVsaWFzb25lcmEuY29tME0GCCsGAQUFBzAChkFodHRwOi8vcmVwb3NpdG9yeS50
+cnVzdC50ZWxpYXNvbmVyYS5jb20vdGVsaWFzb25lcmFzZXJ2ZXJjYXYxLmNlcjAf
+BgNVHSMEGDAWgBSggb5Vm/N/YQWEiy0MO+AISe5XPjAZBgNVHSAEEjAQMA4GDCsG
+AQQBgg8CAwEBDzCBygYDVR0fBIHCMIG/MEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1
+c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2MS5jcmwweaB3
+oHWGc2xkYXA6Ly9jcmwtMS50cnVzdC50ZWxpYXNvbmVyYS5jb20vY249VGVsaWFT
+b25lcmElMjBTZXJ2ZXIlMjBDQSUyMHYxLG89VGVsaWFTb25lcmE/Y2VydGlmaWNh
+dGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMA4GA1UdDwEB/wQEAwIEsDB4BgkqhkiG9w0BCQ8EazBpMA4GCCqGSIb3
+DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQB
+LTALBglghkgBZQMEAQIwCwYJYIZIAWUDBAEFMAcGBSsOAwIHMAoGCCqGSIb3DQMH
+MBoGA1UdEQQTMBGCD2lkcC51bGFwbGFuZC5maTANBgkqhkiG9w0BAQUFAAOCAgEA
+KrVSvHwBWFnLVT/pQoSRaNMTnMymhmYDM78Lo2PVXLEnfmuD8pZYXFTLGxRMDkM/
+bC8oGTXFKBmphr0wn2unD06itE+XBZXpQac+497q1Fb7/rgmf7Vp11Zq2m2yUnjm
+NaGIsjgP+K6Y1EmeAXicbMVHVjJ2MmBuwTRhZI5kOIktUWrHuthSQ3Vu78Urdirz
+fEC0lqokvJIABrQQf36sZc84p7oyrO7EWb2BePM3ZtNQwSpDATTdhDTTdVgETA6T
+JGOcnvlP6i2rVel18noDgvoUuPr8TKkeV5uyc0cF7nfLnqQpRiLrWnF1Eko0Ze3w
+QmGUdoWkB/RQ9BgJ3Bbfo+37EZg+VxXBCI0chCEXjFwMAurS4SzBYplZsBr7WxXH
+JsrHg0F9JQvo5wQ04sZuiMP3WQhVuTdvHay11pih6GY1ujlMMjlbqlg1SrCJ3tMi
+jwhCYD9uz2EVokoHVRBYfsr9iE9H/Fo9PXYIZJNRdpSQahLammOLqnhmhRGBMtg6
+6zHBsKhwIbmxyb2z8ri2J4bucZG0tLqw+5pm39zMjHpvjUJ49cNhVF8hH8Tsxglb
+WBUVl8rtnAcsFuvvT5nyxPRV6+2hromsdwEK4PeUyLz0BFxQM5U/J9KOhC1faVfM
+sNec1gZqKR5mpgC1RQRtCn3q7woBwcokimHhhsFgFu8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <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://idp.ulapland.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lapin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Lapland</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lapplands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lapin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Lapland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lapplands universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.ulapland.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ulapland.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ulapland.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Hangasluoma</md:SurName>
+    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Esa</md:GivenName>
+    <md:SurName>Matasaho</md:SurName>
+    <md:EmailAddress>mailto:esa.matasaho@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Hangasluoma</md:SurName>
+    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Iikka</md:GivenName>
+    <md:SurName>Kupari</md:SurName>
+    <md:EmailAddress>mailto:iikka.kupari@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/moodle.utu.fi.xml b/swamid-interfederations-1.0/moodle.utu.fi.xml
index 969b9461..185d9fe6 100644
--- a/swamid-interfederations-1.0/moodle.utu.fi.xml
+++ b/swamid-interfederations-1.0/moodle.utu.fi.xml
@@ -58,10 +58,10 @@ rol41Nc8xtMqDhVlI9K9MBfdGmj4wnvFzYS6bbAuMcOBUEllwtbhzzJf53XKQBZF
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Abo universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Abo universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/portal.clarin.inl.nl.xml b/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
index 61de72bb..33a0d19e 100644
--- a/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
+++ b/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
@@ -54,7 +54,7 @@ zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
       <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
diff --git a/swamid-interfederations-1.0/rr.funet.fi.xml b/swamid-interfederations-1.0/rr.funet.fi.xml
index e4a6eda8..5c5d5cb3 100644
--- a/swamid-interfederations-1.0/rr.funet.fi.xml
+++ b/swamid-interfederations-1.0/rr.funet.fi.xml
@@ -6,11 +6,12 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
         <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
         <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</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>
diff --git a/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
index b80de835..eb77557b 100644
--- a/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
@@ -1,35 +1,45 @@
 <?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="https://sp.catalog.clarin.eu">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://sp.catalog.clarin.eu">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Catalog Clarin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Catalog Clarin</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Catalog Clarin</mdui:Description>
+        <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:Keywords xml:lang="en">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</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>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
-MTFaFw0xNTA0MTQxMzQ1MTFaMH8xCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxGjAYBgNVBAMTEWNhdGFsb2cuY2xhcmlu
-LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoF+pHBBTzECbn
-IK3k+WuiRpZCv/ECHgUqSq5mw+5x1ZOrP3qW1c/BL+mh8rPM3twPw1zh7faycCzb
-Wg6xjkzbvfnidFq394JdJ8OYHHd4629vF/QQlDiPU/WXNL1PWqh+JNoVbBeZI8Uz
-+xglMyPaLn2rOTcVm5fqk6Do8DrubkZ7fxZ/4CkzJ8rTlFNOCcN8x5G2rWtcJYHa
-xS0ZBhmMt1AmqzWh7ZJCvgS9Wma4ZOhuh3xZSlaEB8o3HWAYprR6g7L+HFvmKdfK
-8oGbBViHUqsslr80Mtli15ZzxkkBH95fzYPdJTCAMccaqLhvQfjuChy7FsDYI5cV
-fvhaJQIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPV/s0egKEIbVq/6uW/GqGNX3RInMB8G
-A1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGG
-L2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/Bggr
-BgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCyMBGsYojEQdaSJnym2OQQ
-s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
-fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
-ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
-nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
-hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certificate>
+          <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
+SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
+aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
+ODAyMDVaFw0xOTA0MjcwODAyMDVaMIGQMQswCQYDVQQGEwJOTDEMMAoGA1UECBMD
+R0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJLVBMMRMwEQYDVQQL
+EwpjYXRhbG9nIHNwMRowGAYDVQQDExFjYXRhbG9nLmNsYXJpbi5ldTEeMBwGCSqG
+SIb3DQEJARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA38nLf8TTeexrcqzfF5LOQ3F/9Tar+V7kNsLFUKO1ua6npX+4zgBu
+EYCm+hKrKDW09QN8yrBd+79a+slA4nCcpUymkh02rQhVbMpNiEQh8UFjqfaYv5fM
+R1OlgIWYXx2POdn60KbUYXIPGSrp2zQSXMFJMrnUOXHqxF8fxfTdbDEtcviXXwyC
+UjhXC4AJSLL/S8eftV8iioQDZMs5h1Kd95NVFsMhRC5MtD+iUyNsYR8X1PGaFg20
+bVg/Jg2eVNwPas49POr+HBOxk3BBtk8KwCAMwjCQUGL3zn7KeDLDFYsry/bWQtVn
+IbebSTysNhbrji3/VKnsPHiuOfCvYiqWEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQDTDfQr4wjJGAUo7os8PWTmKFkAH4D3oFQpxe4bvf6U9of4+fmE778S+WZc9kKs
+A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
+Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
+ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
+yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
+gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -58,8 +68,7 @@ hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certifi
     <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>Vanvalkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
+    <md:SurName>Technical support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.korp.csc.fi.xml b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
index e8863448..45933ebd 100644
--- a/swamid-interfederations-1.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
@@ -4,14 +4,15 @@
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
-        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
         <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</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>
diff --git a/swamid-interfederations-1.0/sso.utu.fi.xml b/swamid-interfederations-1.0/sso.utu.fi.xml
index e22952f7..979f5b29 100644
--- a/swamid-interfederations-1.0/sso.utu.fi.xml
+++ b/swamid-interfederations-1.0/sso.utu.fi.xml
@@ -64,10 +64,10 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Abo universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Abo universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index e3ca1eda..3391120a 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -11,7 +11,6 @@
       <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ihk.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
@@ -169,6 +168,7 @@
       <shibmd:Scope regexp="false">bcsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">wayf.dk</shibmd:Scope>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>