--- SURFconext/https%3A%2F%2Fsp.www.kielipankki.fi.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.www.kielipankki.fi.xml
@@ -1,56 +1,73 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://sp.www.kielipankki.fi" validUntil="2025-04-16T00:10:02.322974Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.www.kielipankki.fi">
   <Extensions>
     <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
       <RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</RegistrationPolicy>
     </RegistrationInfo>
+    <EntityAttributes xmlns="urn:oasis:names:tc:SAML:metadata:attribute">
+      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
+      </Attribute>
+      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+      </Attribute>
+      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
+      </Attribute>
+    </EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.kielipankki.fi/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="en">The Language Bank of Finland</DisplayName>
-        <DisplayName xml:lang="nl">The Language Bank of Finland</DisplayName>
+        <DisplayName xml:lang="en">Kielipankki (The Language Bank of Finland)</DisplayName>
+        <DisplayName xml:lang="fi">Kielipankki</DisplayName>
+        <Description xml:lang="fi">Kielipankin portaali</Description>
         <Description xml:lang="en">Web portal of the Language Bank of Finland</Description>
-        <Description xml:lang="nl">Web portal of the Language Bank of Finland</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/kielipankki_logo.png</Logo>
+        <Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</Logo>
+        <Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</Keywords>
+        <Keywords xml:lang="en">Language Bank, Portal, discussion forum</Keywords>
+        <InformationURL xml:lang="en">https://www.kielipankki.fi/language-bank/</InformationURL>
+        <InformationURL xml:lang="fi">https://www.kielipankki.fi/</InformationURL>
+        <InformationURL xml:lang="sv">https://www.kielipankki.fi/sprakbanken/</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>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</X509Certificate>
+          <X509Certificate>MIIF1zCCA7+gAwIBAgIJANTT5jZd8O1oMA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD VQQGEwJGSTEQMA4GA1UECAwHVXVzaW1hYTEOMAwGA1UEBwwFRXNwb28xDDAKBgNV BAoMA0NTQzEeMBwGA1UEAwwVc3Aud3d3LmtpZWxpcGFua2tpLmZpMSEwHwYJKoZI hvcNAQkBFhJraWVsaXBhbmtraUBjc2MuZmkwIBcNMTgwODE3MTM1MDIxWhgPOTk5 OTEyMzExMzUwMjFaMIGAMQswCQYDVQQGEwJGSTEQMA4GA1UECAwHVXVzaW1hYTEO MAwGA1UEBwwFRXNwb28xDDAKBgNVBAoMA0NTQzEeMBwGA1UEAwwVc3Aud3d3Lmtp ZWxpcGFua2tpLmZpMSEwHwYJKoZIhvcNAQkBFhJraWVsaXBhbmtraUBjc2MuZmkw ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCkfDQwkylGknxmX9P1oBAa 0t5heQo3dpC+1UPUEP3xq5AuUhSkgvsHjidz6x+NtC6rw9Ger8eawe7gFcKIP59P 96VtC/cgllYb90h8sNmMuudDfEvS/5iWELFNso622lEgILddzYX5v2CG5w0Q9g9t lxUdlDqGisl037Cloe2x4WFhN5IyQa54PQQbVZCy9PswWZ4y5GbbjEDW/vQ/VTPY X1GG3elFNAERPsLctCUK0hesERtvKwiBaHqSc82OGq1J2ZKoZ83uGQNd5Ny/ZqAs k9zr3mx3UpJBVPHZSgE6tCAVRkxN3k9PXwj+de3ns1xeBi4ZcsS8/I+70zON0kEz PLQ/SqOoCSqjSZSoBD4bdq9K+As83uJ1dZf8ePJA3cs6Yukl1J4jdjlOkerBT7Vb gUx2alIse8S9qZqeC7g0LdHymzP/E1w2kLU7Zdi4nJyB28vlZChIj941naMLSjUc MJZKZvXk8GkM4Dej0SohTY/HRc08gGSrSvahQ5jf+zF53c18XIPeqEa/BPu33j5V uJZ0vdaPBcwZRX0aBA7g8kEL2ecUhN/Fbrl8GPkRpb0TrSEDfNJJ3TC5pFcglHWR WUhyq0s4WfVMCyiOEXeI2hEK6n3RefmGTidlOPwkoH0PPD56uvQfQqlK59J1+Ov3 Fm8TnhBNp+DhdT99qw5CxQIDAQABo1AwTjAdBgNVHQ4EFgQUWxNsVz6EzAb3usof psRIKDozkscwHwYDVR0jBBgwFoAUWxNsVz6EzAb3usofpsRIKDozkscwDAYDVR0T BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEACkNlV3KAwIhJWPnOz9Fx/4SUKxPw Lx3Fg4HNRM73Ij5PEtXNxfAf3LiO3om8//L1iwwjl2r2UoGSgQXunLSMUy1bDT0a SHCpadq+JbaE2bDK1jUGTEaETrGtlm0PEc6ZKE2QpoQPhiWHB0Yxi/8EYJlKH2PP cTO+kfZjGUqhDm9hNL6zC+k3dPQhNq4rUkRCwmsXhHHHwj3xU3qopZsFG2DkA/rP lotRiqAH/UFVGrK3eD6m9J/N4qHa4qjmtvqi7i48zopZqneeeshdYkYhq6kKJrZP lvsYK16PvWT9qAuetCJqtExRDu2LgwKmprQMRmsdqze0S1bBaz2mFOK0ufXah7aB y3baZwohK1+KoTqOZQziXM4UiMqefQZoA+JcSfJ7I6NrmvO9BKh/oKbHKw+IWULm N7iUQp3Weil8RtlEiDPH1aSzvZbCELDDkTWECf96s6bczpA1UwgWb5/J6ZTthVd4 BrxUzix+gsJObUcTG2Dd3JXXfDMNvM4yRNWE67Qw0HkSGPkxjwOuglI+exorWOy0 sFYRL/6CK6bushrJWykVgFNvxOsapqdHU3pez3CjjHh/7eUmUxh/Ooayl+k23NlH 2j8fYJjYVFtSQH9PcXFdYC0NZzudbCnllTfjF0cZDEhuISZt///HxCbGM+Q+2V9x EJz+MNHOsjE66B4=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kielipankki.fi/Shibboleth.sso/SLO/Redirect"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kielipankki.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">The Language Bank of Finland</ServiceName>
-      <ServiceName xml:lang="nl">The Language Bank of Finland</ServiceName>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kielipankki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Kielipankki</ServiceName>
+      <ServiceName xml:lang="en">Kielipankki (The Language Bank of Finland)</ServiceName>
+      <ServiceDescription xml:lang="fi">Kielipankin portaali</ServiceDescription>
       <ServiceDescription xml:lang="en">Web portal of the Language Bank of Finland</ServiceDescription>
-      <ServiceDescription xml:lang="nl">Web portal of the Language Bank of Finland</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:displayName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:cn"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:sn"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:givenName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:mail"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
     <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationName xml:lang="nl">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Krister</GivenName>
@@ -67,5 +84,4 @@
     <SurName>Aalto</SurName>
     <EmailAddress>mailto:ling-admin@listat.csc.fi</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical"/>
 </EntityDescriptor>