--- ACOnet/https%3A%2F%2Fopenskos.meertens.knaw.nl%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fopenskos.meertens.knaw.nl%2Fshibboleth.xml
@@ -1,76 +1,97 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openskos.meertens.knaw.nl/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:21Z">
-      <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://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>
-      <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#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="nl">OpenSKOS | Meertens</DisplayName>
+        <DisplayName xml:lang="en">OpenSKOS | Meertens</DisplayName>
+        <DisplayName xml:lang="de">OpenSKOS | Meertens</DisplayName>
+        <DisplayName xml:lang="fi">OpenSKOS | Meertens</DisplayName>
+        <Description xml:lang="nl">Deze ServiceProvider reguleert de toegang tot de SKOS Repository van het Meertens Instituut</Description>
+        <Description xml:lang="en">This Service Provider provides access to the Meertens Institute's SKOS Repository</Description>
+        <Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das SKOS Repository des Meertens Instituts</Description>
+        <Description xml:lang="fi">Tämä palveluntarjoaja tarjoaa pääsyn Meertens Instituutin "SKOS"-arkistoon</Description>
+        <InformationURL xml:lang="nl">https://openskos.meertens.knaw.nl</InformationURL>
+        <InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</InformationURL>
+        <Keywords xml:lang="nl">Meertens onderzoek documentatie taal cultuur geesteswetenschappen CLAVAS CLARIN OpenSKOS+Vocabulary+Service</Keywords>
+        <Keywords xml:lang="en">Meertens research documentation language culture humanities CLAVAS CLARIN OpenSKOS Vocabulary Service</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</PrivacyStatementURL>
+        <Logo height="64" width="44">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.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://openskos.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://openskos.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">OpenSKOS | Meertens</DisplayName>
-        <DisplayName xml:lang="en">OpenSKOS | Meertens</DisplayName>
-        <Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das SKOS Repository des Meertens Instituts</Description>
-        <Description xml:lang="en">This Service Provider provides access to the Meertens Institute's SKOS Repository</Description>
-        <InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</InformationURL>
-        <Logo height="64" width="80">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://meertens.knaw.nl/en/2014/02/27/data-protection_eng_/</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <KeyName>twww11</KeyName>
         <X509Data>
           <X509SubjectName>CN=twww11</X509SubjectName>
-          <X509Certificate>MIID2TCCAkGgAwIBAgIJAPkg2Fz+4wdZMA0GCSqGSIb3DQEBCwUAMBExDzANBgNV BAMTBnR3d3cxMTAeFw0yMzAzMjExMDM4MDlaFw0yNjAzMjAxMDM4MDlaMBExDzAN BgNVBAMTBnR3d3cxMTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMxh NnfJCtaQ5Pm1ised/9C0nAusuw4YxeFUHw8FQSCmQreJv9ony6CEyt1gAy+iXgvQ B5djYHP0MQ+kgO0LTmG13jgbms81P5/huoFRtpEB05PVUquOnTs9UNiNrrkX8nGK xDK+QCmRNHuG0pDEerX2YbmJ9RMWQwlZOu3a93e0UJyRCFVXVjggM1sh6szCEexM rnwD+k7R/J/Hm5cYTmocH37ejPj0XCc7T6OFwWH9dT+zFLLSbmwpH695oLyv6vw7 coZVCjXDBP6L3KGH9/nz8SRkexYoTCkH4CfXHYLIFvdehQpri3x6aOmHf91PFYAM iig4IX3usKWBP8D7IcY/YxGC7XMhsd8z56D2tRs1D6bc/ENqKqUtrUN4pafKE+Pa xMoKFJLUKsxdZKNnVjDV9A+RxSW6sMASTNr/jU1t9KJ69lz3CiKH+u9iu+sHoM54 ACZe/Fq7TRDSrKkahB9KPHDabVNlXT3YHWVLDrfcP8C+pd6GNeHrR+kSLZ+WJQID AQABozQwMjARBgNVHREECjAIggZ0d3d3MTEwHQYDVR0OBBYEFM2+7w3JPQ1zQfsn YTsbwk7Hx/1lMA0GCSqGSIb3DQEBCwUAA4IBgQArAuia/qbgfU5Nb+LCPX9WPNXp dS/jqWxrBx+4GnkQ4S4HUTUp/kHDmqpRySOat/OB9uVVf879n2CqXMkh6Hs2uhmf NXnW0HixQKEjPnAvhy+76zMSsVtIeQEd0A9NHFJYt4mALRo1zZo4//afWjk9IoI3 bRFUtYULGnYEPSW9nNSehInch2wjsYx8GwVLKS8ZQhkG0u6sKyyPgpXJYCImCqg+ OWjKwkUUlJdWXeVPYuIbQePyaImsaDVzJ37bpGfu0EJjMmEzI2egAsMdp74vdChj Cc35/q+eROfWBldfLyIByOMTVcBWQv+RnXxZU+gLh14W9O5EZ+yVwDP2FWNBn3D/ SXx2T2dWcQkzFGL/ABAlwYFAEl8bH/TwL6qHuTtkekR5HeHf8PtAJMZOZVmLmGxj XdA6TSRqSRtAFnBccZVoYPI3yhKQXVa+8WTzf5aMsnId5cKTD+brbgccGC447R0F yPpfx99JUCixoTuSY2bHjeutF4teNsCMEFhA0IM=</X509Certificate>
+          <X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a E7gfLARdAbSMy3ntWsCqI0M4uXkeN8vZe2aiBUGi0hN9TuN9DO8mr4P8EXjhT0qQ /tfff3FOJggFQwT8xXjSxevD3/fQfc31cc19W48xLzZ2299w0GlT6ABVeykixnT/ 2N4BUFwlGKKSYZ25VvF7HStpO8PoqoOU+vTxxOSHv+k8r/E+e8/Yqy1x+tYwjtCp mRTuej2AEg7EvCPez4+63GcSkSFJDTkAdUkIsQwBvBjceeeNjPrfDdcVriYq8zEq aHlAM88NOWqkzhFn7RDDQ9I40Km2sv+zEwHn+cYe8RQktx+7kTocNfttlc6Gj3cx wBo6gLCYlDtE9Bp4Hg0CAwEAAaM0MDIwEQYDVR0RBAowCIIGdHd3dzExMB0GA1Ud DgQWBBTEKetHu5XysV19YPdBXllRdGy+0jANBgkqhkiG9w0BAQUFAAOCAQEAIRi/ IZLuNXS7kk8e6Hj4QW0eeqNBpHRHVPC/J2/2C9GpRVEPCmsYTRhIDc6y1XDEpJlW u6J75jXhfSisrzaVYvDTLymYV2qhob3hqlM39PGcyXWvnyT8HWQA6nhOGIIq2K2c M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE 6qUUo3jx8o3Uv51YiYTaPeMacxDH4TcMEZOttUmY7SH7jkZCoRlpFnozCB6QwfA/ 5D7JsQ/vElBegBrNmdrIoZyI+ezREelVATJURfgJu+47mmhVWIK0St6S1y+pgPQ4 1bxBV69YDJSB5BjVPA==</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>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/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://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">OpenSKOS | Meertens</ServiceName>
+      <ServiceName xml:lang="nl">OpenSKOS | Meertens</ServiceName>
       <ServiceName xml:lang="en">OpenSKOS | Meertens</ServiceName>
-      <ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das SKOS Repository des Meertens Instituts</ServiceDescription>
+      <ServiceDescription xml:lang="nl">Deze ServiceProvider reguleert de toegang tot de SKOS Repository van het Meertens Instituut</ServiceDescription>
       <ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's SKOS Repository</ServiceDescription>
+      <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"/>
-      <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">http://www.meertens.knaw.nl/cms/nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.meertens.knaw.nl/cms/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>
@@ -81,4 +102,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>