--- DFN-AAI/https%3A%2F%2Fwww.nederlab.nl%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fwww.nederlab.nl%2Fshibboleth.xml
@@ -1,34 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nederlab.nl/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:24:43Z">
-      <RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</RegistrationPolicy>
-      <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://refeds.org/category/research-and-scholarship</AttributeValue>
         <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
-        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
-        <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
-      </Attribute>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>none</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#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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="nl">Meertens Instituut</DisplayName>
+        <DisplayName xml:lang="en">Meertens Institute</DisplayName>
+        <Description xml:lang="nl">Deze ServiceProvider reguleert de toegang tot Nederlab onderzoeksomgeving en geselecteerde diensten ten behoeve van geesteswetenschappelijk onderzoek op het terrein van Nederlandse taalvariatie en cultuur</Description>
+        <Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment and selected services for humanities research activities in the domain of Dutch language variation and culture</Description>
+        <InformationURL xml:lang="nl">https://meertens.knaw.nl/</InformationURL>
+        <InformationURL xml:lang="en">https://meertens.knaw.nl/en/</InformationURL>
+        <Keywords xml:lang="nl">Meertens onderzoek documentatie taal cultuur geesteswetenschappen nederlab</Keywords>
+        <Keywords xml:lang="en">Meertens research documentation language culture humanities nederlab</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://www.knaw.nl/en/privacy</PrivacyStatementURL>
+        <Logo height="195" width="172">https://meertens.knaw.nl/wp-content/themes/Meertens-2024/images/logo_Meertens.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.nederlab.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.nederlab.nl/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">Meertens Institut</DisplayName>
-        <DisplayName xml:lang="en">Meertens Institute</DisplayName>
-        <Description xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</Description>
-        <Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment and selected services for humanities research activities in the domain of Dutch language variation and culture</Description>
-        <InformationURL xml:lang="en">https://meertens.knaw.nl/en/</InformationURL>
-        <Logo height="180" width="159">https://mdv.aai.dfn.de/media/logos/e459/logo_Meertens.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://www.knaw.nl/en/privacy</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -38,44 +49,52 @@
           <X509Certificate>MIID9DCCAlygAwIBAgIJAKaHxv/BDOsrMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV BAMTD3d3dy5uZWRlcmxhYi5ubDAeFw0yNDA0MDUwOTUyMzJaFw0yNzA0MDUwOTUy MzJaMBoxGDAWBgNVBAMTD3d3dy5uZWRlcmxhYi5ubDCCAaIwDQYJKoZIhvcNAQEB BQADggGPADCCAYoCggGBALxcEt70TgEGQDLSDYi5vF2g6GCpLeqGZdzeGvyrJQip EXduHVJmHzzxKnsEjjmQLfQGIFIl2+0K8Uzg73h8S9N7lSMTPjRVTgr0+D6eGkWn e0mPP4mwISR+QU6dKXMIczLIHlVSl/FWZRyrDQmVlA+DB+CpgsdK2KPEHMB1rRlJ Wg+5ugvxRy0HGjSxVE0VAeV8Z7vrrQ1/J+1vqGL5wqFWi3T/21tMouaaJ0t30tcy 5gts/adWdIRtrdHhNX1fNfAPlgmJXpco4bPNFfxdNbgCuHDclZ+84zXoMrSMkKpZ OzM2PpAh3BKou7Jwixtpximqt4/wpl/LaVIYbqUEASN/UGP64/ERs3m10R5pjXTV 2si0k+X//tiq7eQclgwnyL4xrYc0X+3eiJVGftYSX1907+KF93a2t7zEywqBhw5c sMGBKdfu9RW06sFb1jR3HZjAJlizrkt9HacjFP9XqjZrZCimVMZhkdalQ2INQJWc zOHAG9nT/7sVTxBJLA4yCQIDAQABoz0wOzAaBgNVHREEEzARgg93d3cubmVkZXJs YWIubmwwHQYDVR0OBBYEFCg7wCd+zUOknoNo0lPP7Hi8BUmiMA0GCSqGSIb3DQEB CwUAA4IBgQAZ0SQN+oFY5fTOFIVa40MoTOY7uWjip1Rd9UjA2mi8pWsqTiLyFPNb X6Odz5ah2xLR84E8JuADCRLGFeS0yoD2fHBuDOKrvGPFoTJXfGBB4K3pP8AAnU6Z TJSXGt6+qCbJsKdFPfpCQ1ecF+KxHyPsZFFMQH+7QOQmHIrhnwZzlE87IlEtWStg A1nCYp0xviKSssSRd2gZMDxa3svolNN0Agq0fGDCvCqtoSkiNv30sG58MmXk/+um B9Dp3D0MAwDbPz/lyxZ40TnjGOZQRxnCkof5EC0X16M34A0CBaV852ZWapiElloB Ad143jPgbR0jqU+2lBXI8iHUwcBlLC+GNB5XfdisOn65v+UMv7/cmoYeaKiSS3eX Hd02BeJUJpS7aIZBx8sSAUI0YpXIiXYICJ2sI2UobD0V4Eesko2f7M2sSg/fE39r p8Py3TGZvGj7tUx4c26YKK2VVhDeOGvHgot8NcxEmjlM3PwyFzHXbje8GZyZjo8i 166he5umA9w=</X509Certificate>
         </X509Data>
       </KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <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>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Artifact"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
     <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.nederlab.nl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Meertens Institut</ServiceName>
-      <ServiceName xml:lang="en">Meertens Institute</ServiceName>
-      <ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</ServiceDescription>
-      <ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment and selected services for humanities research activities in the domain of Dutch language variation and culture</ServiceDescription>
+      <ServiceName xml:lang="en">Nederlab</ServiceName>
+      <ServiceDescription xml:lang="en">Access to the Nederlab service</ServiceDescription>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:mace:dir:attribute-def:uid" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="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="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e459</OrganizationName>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://clarin.eu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="nl">Meertens Instituut</OrganizationName>
+    <OrganizationName xml:lang="en">Meertens Institute</OrganizationName>
+    <OrganizationDisplayName xml:lang="nl">Meertens Instituut</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Meertens Institute</OrganizationDisplayName>
+    <OrganizationURL xml:lang="nl">https://meertens.knaw.nl/</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://meertens.knaw.nl/en/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Concern</GivenName>
-    <SurName>Infrastructure</SurName>
-    <EmailAddress>mailto:concern-infrastructure@di.huc.knaw.nl</EmailAddress>
-  </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>KNAW</GivenName>
     <SurName>Support</SurName>
@@ -86,4 +105,9 @@
     <SurName>Infrastructure</SurName>
     <EmailAddress>mailto:concern-infrastructure@di.huc.knaw.nl</EmailAddress>
   </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Concern</GivenName>
+    <SurName>Infrastructure</SurName>
+    <EmailAddress>mailto:concern-infrastructure@di.huc.knaw.nl</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>