--- SURFconext/https%3A%2F%2Fwww.meertens.knaw.nl%2FShibboleth.sso%2FMetadata.xml
+++ CLARIN IdP/https%3A%2F%2Fwww.meertens.knaw.nl%2FShibboleth.sso%2FMetadata.xml
@@ -1,56 +1,100 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata" validUntil="2024-11-29T00:10:03.496921Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join</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>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="en">CMS Meertens Instituut</DisplayName>
-        <DisplayName xml:lang="nl">CMS Meertens Instituut</DisplayName>
+        <DisplayName xml:lang="nl">Meertens Instituut</DisplayName>
+        <DisplayName xml:lang="en">Meertens Institute</DisplayName>
+        <DisplayName xml:lang="de">Meertens Institut</DisplayName>
+        <DisplayName xml:lang="fi">Meertens Instituuti</DisplayName>
+        <Description xml:lang="nl">Deze Service Provider reguleert de toegang tot het Meertens Archief en geselecteerde diensten</Description>
         <Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services</Description>
-        <Description xml:lang="nl">Deze Service Provider reguleert de toegang tot het Meertens Archief en geselecteerde diensten</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/logo_meertens_full.png</Logo>
-        <PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</PrivacyStatementURL>
+        <Description xml:lang="de">Dieser Service Provider regelt den Zugang zu den Meertens Institut Archive und Diensten</Description>
+        <Description xml:lang="fi">Tämä Palveluntarjoaja kontrolloi pääsyä Meertens Instituutin arkistoon ja asiantuntijapalveluihin</Description>
+        <InformationURL xml:lang="nl">http://www.meertens.knaw.nl/cms/nl</InformationURL>
+        <InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</InformationURL>
+        <Keywords xml:lang="nl">Meertens onderzoek documentatie taal cultuur geesteswetenschappen archief</Keywords>
+        <Keywords xml:lang="en">Meertens research documentation language culture humanities archive</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</PrivacyStatementURL>
+        <Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</Logo>
       </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.meertens.knaw.nl/Shibboleth.sso/Login"/>
+      <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.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>www.meertens.knaw.nl</KeyName>
         <X509Data>
-          <X509Certificate>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</X509Certificate>
+          <X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.meertens.knaw.nl,OU=I&amp;A,O=KNAW,L=Amsterdam,ST=NH,C=NL</X509SubjectName>
+          <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">CMS Meertens Instituut</ServiceName>
-      <ServiceName xml:lang="nl">CMS Meertens Instituut</ServiceName>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="nl">Meertens Instituut</ServiceName>
+      <ServiceName xml:lang="en">Meertens Institute</ServiceName>
+      <ServiceDescription xml:lang="nl">Deze Service Provider reguleert de toegang tot het Meertens Archief en geselecteerde diensten</ServiceDescription>
       <ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services</ServiceDescription>
-      <ServiceDescription xml:lang="nl">Deze Service Provider reguleert de toegang tot het Meertens Archief en geselecteerde diensten</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:uid"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:mace:dir:attribute-def:uid" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
+    <OrganizationName xml:lang="nl">Meertens Instituut</OrganizationName>
     <OrganizationName xml:lang="en">Meertens Institute</OrganizationName>
-    <OrganizationName xml:lang="nl">Meertens Instituut</OrganizationName>
+    <OrganizationDisplayName xml:lang="nl">Meertens Instituut</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Meertens Institute</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">Meertens Instituut</OrganizationDisplayName>
+    <OrganizationURL xml:lang="nl">http://www.meertens.knaw.nl/cms/nl</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</OrganizationURL>
-    <OrganizationURL xml:lang="nl">http://www.meertens.knaw.nl/cms/nl</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>KNAW</GivenName>
@@ -60,7 +104,7 @@
   <ContactPerson contactType="technical">
     <GivenName>Concern</GivenName>
     <SurName>Infrastructure</SurName>
-    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+    <EmailAddress>mailto:concern-infrastructure@di.huc.knaw.nl</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Concern</GivenName>