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

16 files changed, 419 insertions, 106 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 1f7be6a3..db6d46f1 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="2013-10-19T10: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="2013-12-02T08: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/core.uwap.org.xml b/swamid-interfederations-1.0/core.uwap.org.xml
new file mode 100644
index 00000000..ac7aacde
--- /dev/null
+++ b/swamid-interfederations-1.0/core.uwap.org.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
+      </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">norway</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UWAP</md:ServiceName>
+      <md:ServiceName xml:lang="no">UWAP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</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"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Åkre Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/filesender.funet.fi.xml b/swamid-interfederations-1.0/filesender.funet.fi.xml
index 5cb0183f..89dde5db 100644
--- a/swamid-interfederations-1.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-1.0/filesender.funet.fi.xml
@@ -4,14 +4,14 @@
     <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="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="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="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">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/foodl.org.xml b/swamid-interfederations-1.0/foodl.org.xml
index 9aaff479..91edbfcc 100644
--- a/swamid-interfederations-1.0/foodl.org.xml
+++ b/swamid-interfederations-1.0/foodl.org.xml
@@ -1,10 +1,17 @@
 <?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://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi.xml b/swamid-interfederations-1.0/fse.eduuni.fi.xml
index 44d95794..dcf476aa 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi.xml
@@ -4,39 +4,34 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+0xjzANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-RkkxEDAOBgNVBAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtl
-c2t1cyBDQTEaMBgGA1UECxMRUGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZS
-SyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMwHhcNMTEwOTA1MDgwMDAwWhcNMTMw
-OTA1MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMHVXVzaW1hYTERMA8G
-A1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJpbWlu
-aXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6uO2/A1TiGW1n/NHldRDLISVw5u/cjM0D+x237es/
-xkJBM+tyyBGO7Ta8gIIBRezYkzUDpDYhKOdtkpzFUpYL9zTXWwaD3Qay323TTuFF
-U8qIs7sg980aaJ287gnnxe6PkhP2s1mYRhgBgP7pCSTEw4YFArn7zyaTwqaD8QUY
-T2k07/IrP2tK0tF9quxtdVAf6LmUaVo0+vsXvDxH5APGFU/81hi1RQNbIAtDXZgN
-drnlHcP3yuUlrJTGuLAV7dyiHd2OLXOt/Dx6eUfI1/Y5tYQw8kUqdlOPcOmiWVBT
-efuqutqFLwXq6RV9xZnbFkmdAiJeK246xkz7/TJ9hdQrAgMBAAGjggKMMIICiDAM
-BgNVHRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEK
-BAEwga8wgYQGCCsGAQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0
-YXZpbGxhIC0gQ2VydGlmaWthdCBwb2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBw
-b2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMwJgYI
-KwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8GCCsGAQUFBwEB
-BDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
-cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAfBgNVHSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHn
-MIHkMCugKaAnhiVodHRwOi8vcHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3Js
-MIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmluZWlkLmZpOjM4OS9jbiUzZFZSSyUy
-MENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUzZFBhbHZlbHV2YXJt
-ZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1lJTNk
-RklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQW
-BBSjFTaTWYoUyyp3jwXkzrGD3xcFVTANBgkqhkiG9w0BAQUFAAOCAQEAY9eZv6EX
-QMUT/uRKWbahBYiNHVrFNAN1QJiui+URiil/H/glQ7r+os3z2EZBle56f0gVplkh
-Ki8l/xge9S6IZz7y1wbZi0euvIgJ4W3EsbC2uWZn4elOr+D7j+4fep+46Ko7ROBn
-eryGe01KBXZWJBkFaqzoJCL8BF2vbtsYMqJaVtzDXdv101CxbeZ4bPeJa3XsQ/6k
-rQ5gBxGmQsJJfMf50HRu/k2kwpvyEryKtk50Xmm89V2CjWoPylxOyWv1a+BAPQpe
-7h6IenpuNGUJJ4eUN/O2CLOsH446n97IHtrM/pzz38dQEFjfY9G+oEA+s/mJRRQa
-NUEsJ2eMhHrNWw==</ds:X509Certificate>
+          <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
+BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
+UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
+HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
+VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
+bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
+2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
+B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
+2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
+NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
+HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
+AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
+b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
+ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
+CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
+cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
+HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
+cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
+ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
+ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
+JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
+JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
+R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
+FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
+f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
+e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
+An5aXL3c9Q==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
index 5f2baa5f..e0ff75b4 100644
--- a/swamid-interfederations-1.0/idp.csc.fi.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi.xml
@@ -5,15 +5,15 @@
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <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:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <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="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:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
         <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>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
@@ -26,32 +26,31 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEvjCCA6agAwIBAgIRANzJo7X5SEmbvBstb88M+4kwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTEyMjEwMDAwMDBaFw0xMzEyMjAyMzU5NTlaMIGBMQswCQYD
-VQQGEwJGSTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UEBxMFRXNwb28xKTAnBgNV
-BAoTIENTQyAtIElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRAwDgYDVQQLEwdV
-bmtub3duMRMwEQYDVQQDEwppZHAuY3NjLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy9838XN93089o/ATNm9YxJkrX8hqp
-CNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2YgVPz4HDLbL1wakiq2MvbQFmYvcEw
-8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBoqTCidlczNetoCU+LuuUjEvvqWZai
-GSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLFaaxQsSt9ccgkVfAXupCqvoSlF2Vb
-uXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYceBDsJJHLaicsiBgL3imt9EulnoY+
-5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+bwIDAQABo4IBeTCCAXUwHwYDVR0j
-BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHtybSZjYQP+ZNnx
-CQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDEGA1UdEQQqMCiCCmlkcC5jc2Mu
-ZmmCDGlkcDAxLmNzYy5maYIMaWRwMDIuY3NjLmZpMA0GCSqGSIb3DQEBBQUAA4IB
-AQBo9n3P845t8Z4ib7SVF/dPa6Sa7zPCWIwFpnKrAgjtsgFQX8usixP7thxgxDfa
-yq91lqm8VBAmIjzMd8NS4TdckKtlmxh6178KR9KIRUyvWsI1L74ANGycs3eF84TQ
-YNFbjK64dwCnMNGfVw1zepuRBVE0BLklgn8wqQf6yKj1HzOB6UT4UUABt71zrdcS
-yv274zsJoe2SU6+POX6wH82lz5Vc9BkxLE8vBSGB78n4BFKSdEPRWIYkeq7Kwk8L
-MwFER9iEtf/HEH+CmxYoqZCr/mm7FduiAyOdQ+AZrQgvFP2c5sqxqhAwQyrW9eU/
-yDPlRNL+S5OBIx61TJQTJ1DZ</ds:X509Certificate>
+          <ds:X509Certificate>MIIEfTCCA2WgAwIBAgIQUB8GAq0UqrSAF/D1Yq57fDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTAxNTAwMDAwMFoXDTE2MTAxNDIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuY3NjLmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy
+9838XN93089o/ATNm9YxJkrX8hqpCNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2Y
+gVPz4HDLbL1wakiq2MvbQFmYvcEw8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBo
+qTCidlczNetoCU+LuuUjEvvqWZaiGSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLF
+aaxQsSt9ccgkVfAXupCqvoSlF2VbuXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYc
+eBDsJJHLaicsiBgL3imt9EulnoY+5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+
+bwIDAQABo4IBgzCCAX8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFHtybSZjYQP+ZNnxCQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAxBgNVHREEKjAoggppZHAuY3NjLmZpggxpZHAwMS5jc2MuZmmC
+DGlkcDAyLmNzYy5maTANBgkqhkiG9w0BAQUFAAOCAQEAJg8/vlHPhYOW/oVhdkjD
+mNbEA0B6WysVPHyZjjJ6MXnCioZYa0plsnQjvmcaB2BLgPBw95dsC+7/FS6/TCZW
+HLta5Z3ziwvfsIRtiVKRQLn2CgvZob3EBQVHZ+5DvFXTAptlMvvrmOV0XHhZIM2B
+Pg7pj5SpsgWOtHVlyyFD/mGUKSJymncWq310/CY1tQlwB1u40q23rIjYQEyurJRp
+s6fLXrTs0qcyA+Es3RBwbXfSEJqeXOm01K3Ys+JWUNzrg30P1z7zmx0M4nhqaI9N
+H3YX4fNdibt18KEE5w7rXmwJTJwwDxw3UHR3rAcu+PxREwAl22zTk2oSc7DLUMib
+Iw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index e2356329..dd7b6a1d 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -15,6 +15,7 @@
       <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
@@ -49,6 +50,7 @@
       <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
@@ -166,6 +168,7 @@
       <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
@@ -213,6 +216,7 @@
       <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.shh.fi.xml b/swamid-interfederations-1.0/idp.shh.fi.xml
index 6e902acc..d41b14a5 100644
--- a/swamid-interfederations-1.0/idp.shh.fi.xml
+++ b/swamid-interfederations-1.0/idp.shh.fi.xml
@@ -11,32 +11,30 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEzTCCA7WgAwIBAgIQK949tWfXb8PXIyPj420VwjANBgkqhkiG9w0BAQUFADA2
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQR1F2IKk/FGfCBPi7E7Lr9DANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTExNTAwMDAwMFoXDTEzMTExNDIzNTk1OVowga0xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDEwMTEPMA0GA1UECBMGTnlsYW5kMRQwEgYDVQQH
-EwtIZWxzaW5nZm9yczEYMBYGA1UECRMPQXJrYWRpYWdhdGFuIDIyMSowKAYDVQQK
-EyFIQU5LRU4gLSBTdmVuc2thIGhhbmRlbHNob2dza29sYW4xDDAKBgNVBAsTA1NE
-QzETMBEGA1UEAxMKaWRwLnNoaC5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAM2k+mkqzcw+iee9ADHbh3ESyUovAphz6JrMWlsuqV4Fe8paTwZvmH7w
-cbcqcB6pHPPP5ZeGg2MJ5ySsXGCZt1y54s1x7eXlC/gW0idpi1g4b405HK72VzRU
-0nM9lmN8MXDWNp0PL+2WlcYqEkFG66eoij/uvAZ6R/rlv9Yqp+5YODT7rnK+8+Ad
-AiI/HHhvRWnpZ3JmKEUFRQMGEBdCfl5uVLteTwgXJE2RwXsZM8ssdWueVnz+7soo
-K0cRcGlZBTV4i/sxrN/RYcY8ml3YIMEa+Y/M2f7zaNYmlZ0Z7r4y4YS8lxL2kDM8
-X+bX/I1KxrhMPqa3LHyaylBIHwnhCUECAwEAAaOCAV0wggFZMB8GA1UdIwQYMBaA
-FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT4iC98qz60jdzy0FsZMKM5
-D5JpSTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuc2hoLmZpMA0G
-CSqGSIb3DQEBBQUAA4IBAQBiii+RMMzxCzPzM72PA2pqUMfwferGXdl+XeH0tkPy
-Cd8Ggdj1AXtAevhXNJ62GvULS2m/SQ8hsbulCIqzOYejjCBz2IszmMUbCp2GYEEq
-y1Ck2hM/ChctgGpvMonmgn5mxUnecFH7IapTh7zozifejpMEN0/MM0B7LGs7eTJI
-DHUtc3gzsgtW+kmogclxEEhyxzzdY3RDFKnBuX2HGUNJEI35KVIfYyHgV+32jzW4
-2mxQfWAhJ+al0Ooi00F0heVlhP5sS2bNDkAQLltfNDBRllBTJ+hyoR0JRC3kpEXV
-34aXbnif5+6RosrbfiWc0Sa1n7sgtKgwL+PkxGwYVvvx</ds:X509Certificate>
+U1NMIENBMB4XDTEzMTAxODAwMDAwMFoXDTE2MTExMjIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuc2hoLmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0tjmJ1ERx/Za5uVfPURB
+8eTAKK0QEXJD/++dCZcVSrIpau8jiLkmi+kzweI531JVBDrpT24jFGXn2cKnzUIB
+xpOWEUKLQSkYdA3LoKD1gJjjFxF8Y3J237Zlg3QL/dmNnfCLxs8SsXbCsjxpuPAP
+wYRR1ZEL2SjdU3zEDc4iqMqkk5wS4lzjB1SMNFaaKRRsW97BAKATyHRwp4a01nB4
+o0MDNn4iGcIoE3kO9X83H7smurBXGqVzc4dnfH3yLOXF+NMpRbH9upSrSBe2EoZU
+jc+Vi4/fsEXRmr/u+8IOb1ERpYNLCd6L+mD9ppbA3ZeRJe/LRaq7MFQX3VzMR5mn
+xwIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFH9BqIu5UIBGpznMYuQP3dJQ6f7zMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuc2hoLmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBk7DXTXfwZCTrFUVB73h4TzHF2zrIUm83SFCNcn5BBA9qKRL/TfozD4ZwK
+1zfaVtcc8gpS4tUE+T3dOa2zKvUgYSuDScC7cInBht1wLUrukBhQCDIU+0lKaBJv
+A17KXHxowqua95sMKkN3tDUB7lbLCuPxhJyWzE2E9TrJ2oTYQ35C3cGd5FbnLEWk
+9ceS4WR5+t1lpvC4uwWrc0DYgb0ADv9TDW52/qssZKNLbVu5BwRKI6ToAZTgnNbf
+aeNbuslxAJn11gg6nMy8yRVZMTOMZoLK5j4vNXhp8YngrWxdGBDIaEtLvLWfIs99
+nAiHebdvpVCIMaM703zAuuDVImHf</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi.xml b/swamid-interfederations-1.0/logout.uwasa.fi.xml
new file mode 100644
index 00000000..5c2b029d
--- /dev/null
+++ b/swamid-interfederations-1.0/logout.uwasa.fi.xml
@@ -0,0 +1,111 @@
+<?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://logout.uwasa.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">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.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>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
+BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
+VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
+cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
+le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
+AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
+iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
+Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
+du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
+IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
+eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
+HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
+dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
+SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
+exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
+1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
+7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
+OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</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:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/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">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
+BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
+VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
+cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
+le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
+AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
+iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
+Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
+du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
+IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
+eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
+HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
+dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
+SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
+exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
+1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
+7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
+OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/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">Vaasan yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/moodle.helsinki.fi.xml b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
index 8c15898a..3a2261f4 100644
--- a/swamid-interfederations-1.0/moodle.helsinki.fi.xml
+++ b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
@@ -4,10 +4,10 @@
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
       <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Helsinki Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Helsinki\'s Moodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Helsinki\'s Moodle learning management system.</mdui:Description>
         <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
+        <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/moodle.utu.fi.xml b/swamid-interfederations-1.0/moodle.utu.fi.xml
index b9d074b6..c662c771 100644
--- a/swamid-interfederations-1.0/moodle.utu.fi.xml
+++ b/swamid-interfederations-1.0/moodle.utu.fi.xml
@@ -40,6 +40,36 @@ Z/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgIQT5QLlkD90BQrkITUEnBTjzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTEwMTAwMDAwMFoXDTE2MTAzMTIzNTk1OVowOzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1tb29kbGUudXR1
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0L
+rBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTv
+S/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hv
+QAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO
+4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3
+PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwi
+MfeM0wIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1tb29kbGUudXR1LmZpMA0GCSqGSIb3
+DQEBBQUAA4IBAQAqzKnyX9RnkwXwOM1szmj5iCMwTLVKl+ULpwxajHKs3Y8qXpgZ
+qR0JGgdAPE+qpWPQHRy+H0wwoAGwJHayyYVqd0WEUD6ET1YqxLGCbPA6I+gCLwN/
+2Gr2zU+BrPZ+Lbx3libwYEe4DtRhrHGvM+EoK703HLyQbAIFbQQG7xrEFOD4yjFB
+grT2zSpweu6njvXsomDNwjdCcG2sP7xOm5+ECGwB7RS85l6tAhkw/LR3msagUpZ5
+rol41Nc8xtMqDhVlI9K9MBfdGmj4wnvFzYS6bbAuMcOBUEllwtbhzzJf53XKQBZF
+0uKP0MosqHl91zcW2TOx0wxNhL4Hhavhe0hr</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
diff --git a/swamid-interfederations-1.0/rr.funet.fi.xml b/swamid-interfederations-1.0/rr.funet.fi.xml
index 931402cb..e18fbed2 100644
--- a/swamid-interfederations-1.0/rr.funet.fi.xml
+++ b/swamid-interfederations-1.0/rr.funet.fi.xml
@@ -9,8 +9,8 @@
         <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:Keywords xml:lang="en">attribute test</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/hallinto/haka/luottamusverkosto/palvelut/attributetest/</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>
@@ -139,9 +139,9 @@ PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</ds:X509Certificate>
     <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Timo</md:GivenName>
diff --git a/swamid-interfederations-1.0/sp.lat.csc.fi.xml b/swamid-interfederations-1.0/sp.lat.csc.fi.xml
index 96d91258..5bcd4bc3 100644
--- a/swamid-interfederations-1.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-1.0/sp.lat.csc.fi.xml
@@ -9,12 +9,12 @@
         <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
         <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
         <mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</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
new file mode 100644
index 00000000..7802e846
--- /dev/null
+++ b/swamid-interfederations-1.0/sso.utu.fi.xml
@@ -0,0 +1,85 @@
+<?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: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://sso.utu.fi/sso-idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <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: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>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
+BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
+MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
+DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
+aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
+vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
+DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
+YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
+Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
+7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
++9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
+kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
+by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
+b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
+ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
+MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
+cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
+ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
+AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
+AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
+AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
+AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
+ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
+AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
+BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
+AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
+QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
+A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
+m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
+nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
+njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
+5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
+8MIAfW66Oc6zKMOf26tiwK0/jhtn</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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </md:IDPSSODescriptor>
+  <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: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: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>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petri</md:GivenName>
+    <md:SurName>Teraspuro</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elina</md:GivenName>
+    <md:SurName>Toivanen</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
index b48f8929..3278feca 100644
--- a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
@@ -41,6 +41,36 @@ zQgT271kaFblsw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdjCCA16gAwIBAgIRANjPKkKEQJwfMHea3kHeKBAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzEwMzAwMDAwMDBaFw0xNjExMDkyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUdHVsbGJvbW1l
+bi5hcmNhZGEuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUB/mi
+pk7Yn/0yQa9rpQ3AMGmR09/45kBJxos6nS9dCbPZ+efy0dNnvcF/hXCbvbnYXHiA
+ZJg1TjBFOJO6jePNplzs8oDWIk5BV/YaWrnKzZnua66m4dfeFIqLXnTrlnR3bBrN
+9GOdSDHdMEuTIntm+2OVnpJUnVLTBsFjqGcnWISsk7DxSWvJJI5cirawQ+RK3yeX
+QSjg/VXpWQYVTahLe938VaZ7LU2cLeNJ0O2ipv5LEXM5mLX7KSbI+/aSOdXi+0Wd
+D7ThYzrjG1cWwIW8YwU1INIZu1wOvzc+r4LyIix4wFaKIoROHiGr/dMbxgz9oOaC
+kaLl2ZdK4OH2h1n/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUYw143pn/Vha8iT1GD6cNUD36ZxYwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHR1bGxib21tZW4uYXJj
+YWRhLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBRld8PJrEUESgRtOrIVYJ9cyPENSki
+Dg5PFCvckLcfo6t0Or6Bfq5T5575x695zuKw6pD7xToO3oadzqgohveIWpN+qyEz
+0uuQahsRq9cRVQfd9SGensZWfem3ujQZXk3sGwd350G7CiCcNJcNtbsb1wUdFPjW
+h0xhzFZPrHiD0hjAfx8nDMIlIdN2wQtok0+XHN2mll05DGLG2CtniIAnHEOVWEyH
+/bbmOj3zhw+kGJza5x7tldQLVsPntuBsvm74rKW+nAGVfyqhgWlB5kcTuVCe33sw
+d0vPK8knVsYNfPg0Ms8UNdm1LuFpkjxWiwJ4y9IFW7zf86tmV+ryxuBy</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-POST" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index daa12147..b8a0696b 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -41,7 +41,6 @@
       <shibmd:Scope regexp="false">sopu.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosufh.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">faaborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">og.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aa.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
@@ -111,7 +110,6 @@
       <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hogym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eucsyd.dk</shibmd:Scope>
@@ -126,13 +124,11 @@
       <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dansidp.uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">iva.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dansidpq.uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dansidpp.uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
@@ -163,6 +159,8 @@
       <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">statsbiblioteket.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eadania.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>