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

22 files changed, 72 insertions, 46 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 08a8dac4..6f35035f 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-04-14T12:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-04-28T13: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/auth.asiaportal.info.xml b/swamid-interfederations-1.0/auth.asiaportal.info.xml
index 185c51f5..3cac1605 100644
--- a/swamid-interfederations-1.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-1.0/auth.asiaportal.info.xml
@@ -4,14 +4,14 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDQjCCAqugAwIBAgIDCi9hMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDgxMTE4MDkxMzE3WhcNMTExMTE5MDkxMzE3WjCBzDELMAkGA1UEBhMCREsxHTAbBgNVBAoTFGF1dGguYXNpYXBvcnRhbC5pbmZvMRMwEQYDVQQLEwpHVDczNzI2MTMyMTEwLwYDVQQLEyhTZWUgd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvY3BzIChjKTA4MTcwNQYDVQQLEy5Eb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBRdWlja1NTTCBQcmVtaXVtKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsc1QDsmxtsjafziHd2MpKFnrb9DIDTK1wxoX42BTqDl2l85tvtbdTGcxkOkHzYmz3B9S/G4s24X6kPCp/mIAfBeyC8iClCop2Xpp4nqqvpyZaKbrTVE8Ris0RRkFwdgPjabZ5sFVo0Cl2ErfBZ9ml3bKbvW3NCinxXMM2r7ow7ECAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFJpQeSzk6m3+6ylNVBn80s/JznzuMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQAZIENBa9r4ielkshXwGmpBg8gLiQDnGbeoREB0YEuioMNQ4otd1pJ6PV1LutT/7ZxE/5QETMyYEkN782CCXIifdLFimsZHxkYZs6hbjbu1jhAApuon2wYPpXDiQFI8hTiE072ahcPQexWZ1xjSuMA+SGZYiSUJh8onRFk45eqkxA==</ds:X509Certificate>
+          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDQjCCAqugAwIBAgIDCi9hMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDgxMTE4MDkxMzE3WhcNMTExMTE5MDkxMzE3WjCBzDELMAkGA1UEBhMCREsxHTAbBgNVBAoTFGF1dGguYXNpYXBvcnRhbC5pbmZvMRMwEQYDVQQLEwpHVDczNzI2MTMyMTEwLwYDVQQLEyhTZWUgd3d3Lmdlb3RydXN0LmNvbS9yZXNvdXJjZXMvY3BzIChjKTA4MTcwNQYDVQQLEy5Eb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBRdWlja1NTTCBQcmVtaXVtKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsc1QDsmxtsjafziHd2MpKFnrb9DIDTK1wxoX42BTqDl2l85tvtbdTGcxkOkHzYmz3B9S/G4s24X6kPCp/mIAfBeyC8iClCop2Xpp4nqqvpyZaKbrTVE8Ris0RRkFwdgPjabZ5sFVo0Cl2ErfBZ9ml3bKbvW3NCinxXMM2r7ow7ECAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFJpQeSzk6m3+6ylNVBn80s/JznzuMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQAZIENBa9r4ielkshXwGmpBg8gLiQDnGbeoREB0YEuioMNQ4otd1pJ6PV1LutT/7ZxE/5QETMyYEkN782CCXIifdLFimsZHxkYZs6hbjbu1jhAApuon2wYPpXDiQFI8hTiE072ahcPQexWZ1xjSuMA+SGZYiSUJh8onRFk45eqkxA==</ds:X509Certificate>
+          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
index 40e8b13c..a5061535 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -3,13 +3,14 @@
   <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:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
+        <mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="fi">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="sv">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>
@@ -52,19 +53,15 @@ An5aXL3c9Q==</ds:X509Certificate>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
     <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Eduuni-tyotilat</md:ServiceName>
-      <md:ServiceName xml:lang="en">Eduuni-workspaces</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Eduuni-tyotilat on opetus- ja kulttuuriministerion toimialan yhteinen sahkoisen tyoskentelyn ja verkostoitumisen alusta.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:ServiceName xml:lang="fi">Eduuni</md:ServiceName>
+      <md:ServiceName xml:lang="en">Eduuni</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Eduuni</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Eduuni is an environment for e-work and collaboration services</md:ServiceDescription>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
index 4fd30a12..82aeafe8 100644
--- a/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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://haka.saimia.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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
index 09d7ec24..79cbe41c 100644
--- a/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
@@ -1,8 +1,15 @@
 <?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.aalto.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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://idp.aalto.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+        <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</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">finland</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
index c373b984..8889ea8a 100644
--- a/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
@@ -1,8 +1,25 @@
 <?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.abo.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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://idp.abo.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
+        <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
+        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
+        <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
+        <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
+        <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>abo.fi</mdui:DomainHint>
+      </mdui:DiscoHints>
       <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>
diff --git a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
index 546d54f3..bc2fc1fe 100644
--- a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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://idp.csc.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 8fabfc45..07e84357 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -191,6 +191,7 @@
       <shibmd:Scope regexp="false">karasjok.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">karlsoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kautokeino.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
       <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
       <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
@@ -232,11 +233,13 @@
       <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">met.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">metisutdanning.no</shibmd:Scope>
       <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
       <shibmd:Scope regexp="false">mhs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">midsund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">modum.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">namsos.kommune.no</shibmd:Scope>
@@ -283,6 +286,7 @@
       <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">porsanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rakkestad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ralingen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml
index e1e1e9e7..6182ba07 100644
--- a/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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://idp.lapinamk.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">edu.tokem.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">lapinamk.fi</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
index 840bd980..320266a7 100644
--- a/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
+++ b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
@@ -1,6 +1,6 @@
 <?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.metropolia.fi/idp">
-  <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
index 3c2462a8..992d4736 100644
--- a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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.oamk.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
index 4e0db6ad..fb6d339a 100644
--- a/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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.shh.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">hanken.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
index b61bcb7f..24b3bce5 100644
--- a/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
@@ -1,6 +1,6 @@
 <?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://idp.tut.fi/shibboleth2">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
       <mdui:UIInfo>
diff --git a/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
index 5c0771e6..1d0d4424 100644
--- a/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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.uef.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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
index 2c4ebebd..d592e193 100644
--- a/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">ulapland.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
index 986ba144..0018aae1 100644
--- a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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://login.helsinki.fi/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
index 92ef41e8..c06a056c 100644
--- a/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
index c6cc9bf5..cb13a972 100644
--- a/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/shibboleth.uta.fi-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.uta.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">uta.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
index 979f5b29..0e84855f 100644
--- a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
@@ -1,6 +1,6 @@
 <?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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
       <mdui:UIInfo>
diff --git a/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
index 599af931..2cddb508 100644
--- a/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
@@ -1,6 +1,6 @@
 <?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://tullbommen.arcada.fi/simplesaml/">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">arcada.fi</shibmd:Scope>
       <saml:Attribute Name="tags">
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index b9666602..7ba10430 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -165,6 +165,7 @@
       <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eamv.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml
index aebafb66..9e63f017 100644
--- a/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml
@@ -3,14 +3,14 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Biolääketieteen Moodle verkkokursseja Nordbiomed ohjelman opiskelijoille</mdui:Description>
         <mdui:Description xml:lang="en">Biomedicine online courses for Nordbiomed students in Moodle</mdui:Description>
         <mdui:Description xml:lang="sv">Moodle webkurser om biomedicin för studenter på Nordbiomed programmet.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.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>
@@ -79,13 +79,13 @@ CAKgw6g9qQ==</ds:X509Certificate>
     <md:OrganizationURL xml:lang="sv">http://www.mediamaisteri.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Mediamaisteri</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:support@mediamaisteri.com</md:EmailAddress>
+    <md:GivenName>Henri</md:GivenName>
+    <md:SurName>Urpalainen</md:SurName>
+    <md:EmailAddress>mailto:henri.urpalainen@mediamaisteri.com</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Mediamaisteri</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:support@mediamaisteri.com</md:EmailAddress>
+    <md:GivenName>Henri</md:GivenName>
+    <md:SurName>Urpalainen</md:SurName>
+    <md:EmailAddress>mailto:henri.urpalainen@mediamaisteri.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>