--- SURFconext/https%3A%2F%2Fsp.onderzoek.zoeken.fame.frl%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.onderzoek.zoeken.fame.frl%2Fshibboleth.xml
@@ -1,52 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" cacheDuration="PT86400S" entityID="https://sp.onderzoek.zoeken.fame.frl/shibboleth" validUntil="2021-08-14T00:10:06.87Z">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onderzoek.zoeken.fame.frl/shibboleth">
+  <Extensions>
+    <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://clarin.eu/category/clarin-member</AttributeValue>
+        <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
+        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+      </Attribute>
+    </EntityAttributes>
+  </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="en">CLST Fame | Radboud University</DisplayName>
-        <DisplayName xml:lang="nl">CLST Fame | Radboud Universiteit</DisplayName>
+        <DisplayName xml:lang="en">CLST Fame</DisplayName>
         <Description xml:lang="en">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</Description>
+        <DisplayName xml:lang="nl">Centre for Language and Speech Technology webservices en webapplicaties</DisplayName>
         <Description xml:lang="nl">Webservices en webapplicaties ontwikkeld en/of onderhouden door het Centre of Language and Speech technology, van de Radboud Universiteit</Description>
-        <Logo height="160" width="200" xml:lang="en">https://static.surfconext.nl/media/sp/clst_ru.png</Logo>
+        <Logo height="44" width="249">https://applejack.science.ru.nl/clst.png</Logo>
+        <InformationURL xml:lang="en">https://webservices-lst.science.ru.nl/portal/</InformationURL>
+        <Keywords xml:lang="en">CLST Centre+for+Language+and+Speech+Technology NLP Natural+Language+Processing Language+Technology RU Radboud+University Text+mining Computational+linguistics Corpora</Keywords>
+        <Keywords xml:lang="nl">CLST Centre+for+Language+and+Speech+Technology NLP Natural+Language+Processing Taaltechnologie RU Radboud+Universiteit Text+mining Computationele+taalkunde Corpora</Keywords>
         <PrivacyStatementURL xml:lang="en">https://applejack.science.ru.nl/privacy.html</PrivacyStatementURL>
       </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://onderzoek.zoeken.fame.frl/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://onderzoek.zoeken.fame.frl/Shibboleth.sso/Login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>opensonar.cls.ru.nl</KeyName>
         <X509Data>
-          <X509Certificate>MIIEKzCCApOgAwIBAgIJALlaaJ0gE1O6MA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNVBAMTE29wZW5zb25hci5jbHMucnUubmwwHhcNMTgxMTA4MDkzODE3WhcNMjMxMTA3 MDkzODE3WjAeMRwwGgYDVQQDExNvcGVuc29uYXIuY2xzLnJ1Lm5sMIIBojANBgkq hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA/F3CuGTdarM3NCVIIv5p6V5xb8+Bv5WZ cX1wmEF8rdNqpa4VVSUC0nIslXbwMhVDDPcCfYCTVYH9PPGn/eaE7ljG8jrm8FjO qOGRUdfNpZMfOXf88KIPBAY9GGBEXYQZY8eK3h8KZZR4dIXsC2in/j8r01uGwG2k es44YIk30n/kpXeInERDJkoj6IPZuYENkxVLdsCSQfc5v2AuSHFOzpM53pIHE+lb 8RRgKCZVgSx6Om5zjDxD9qoWkUUiUFfOxWsqXbmwLaL8JBiELb2YFr/8pES8WX9p QQIcCufczY9HVZtW0H4D3XetqDybPNC8AYD7YyfCRFURehq0nbMOdKNLRYloUQr3 xp/XJuUGBPfYh/3Br9jQMIUbRTxd1PsqIVbWoPIQvPnOaBeu96xwYHJPEX/RMVoV RpmdcDlyphsIGoTkngusa4nnBlVGhj5CfAivP3km3i3pN2/Wllkv7QaIW2shBKwO kkhcT2wRdAQWLTkoP0R0THYW+0fxDS1BAgMBAAGjbDBqMEkGA1UdEQRCMECCE29w ZW5zb25hci5jbHMucnUubmyGKWh0dHBzOi8vc3Aub3BlbnNvbmFyLmNscy5ydS5u bC9zaGliYm9sZXRoMB0GA1UdDgQWBBQt1xh+/scfPMT6aQNA7fGRoUkxgzANBgkq hkiG9w0BAQsFAAOCAYEAln/gaOmUIrUTQpZ3QocbnMAruL5ZrwPxVniAgB3ZvKZ7 f4D2NqEwhcDDx/jb6QdZA3EwGOGBcrAlj4dKmTwCYSdr9wpzgvpSTYrj5Wl9q16X eSecyJFtH/kF8u70I3AoVJt1u5m3cbgTcXfsEqih7iDRR1BABpA9T072o2LNf08B ZrlnG9/Ir2tdlj40saou27Dz/655adEz/xP84ByyXRE8IA+8kC2wEuYiHzvVT9TL h+DW3SRdSJBAEe1ODFXn9BrmR7lw5JxSPzPsRh+5aABhXI1e/6N8dia7IMtCARd0AjMNnZQuPmNAdf9jybX/k6W3foZV5hLHVUMKArWsdu5lEPScCR8wZlLd6e7DSOSvTtR8CIdMYeA4xbUaTcc+nSk5rQlj0UbgkjJd0WH1EOHFtPzuG6ljmFz85gogfAR85EiEMbvA0+i0N83koYTj5FzdgmVXbgmWz0sY8HQx28NwmUG3AG5HXiKYs5mfSNJi MlMNB3WBNoO/vRMFpUxi</X509Certificate>
+          <X509SubjectName>CN=opensonar.cls.ru.nl</X509SubjectName>
+          <X509Certificate>MIIEKzCCApOgAwIBAgIJALlaaJ0gE1O6MA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV BAMTE29wZW5zb25hci5jbHMucnUubmwwHhcNMTgxMTA4MDkzODE3WhcNMjMxMTA3 MDkzODE3WjAeMRwwGgYDVQQDExNvcGVuc29uYXIuY2xzLnJ1Lm5sMIIBojANBgkq hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA/F3CuGTdarM3NCVIIv5p6V5xb8+Bv5WZ cX1wmEF8rdNqpa4VVSUC0nIslXbwMhVDDPcCfYCTVYH9PPGn/eaE7ljG8jrm8FjO qOGRUdfNpZMfOXf88KIPBAY9GGBEXYQZY8eK3h8KZZR4dIXsC2in/j8r01uGwG2k es44YIk30n/kpXeInERDJkoj6IPZuYENkxVLdsCSQfc5v2AuSHFOzpM53pIHE+lb 8RRgKCZVgSx6Om5zjDxD9qoWkUUiUFfOxWsqXbmwLaL8JBiELb2YFr/8pES8WX9p QQIcCufczY9HVZtW0H4D3XetqDybPNC8AYD7YyfCRFURehq0nbMOdKNLRYloUQr3 xp/XJuUGBPfYh/3Br9jQMIUbRTxd1PsqIVbWoPIQvPnOaBeu96xwYHJPEX/RMVoV RpmdcDlyphsIGoTkngusa4nnBlVGhj5CfAivP3km3i3pN2/Wllkv7QaIW2shBKwO kkhcT2wRdAQWLTkoP0R0THYW+0fxDS1BAgMBAAGjbDBqMEkGA1UdEQRCMECCE29w ZW5zb25hci5jbHMucnUubmyGKWh0dHBzOi8vc3Aub3BlbnNvbmFyLmNscy5ydS5u bC9zaGliYm9sZXRoMB0GA1UdDgQWBBQt1xh+/scfPMT6aQNA7fGRoUkxgzANBgkq hkiG9w0BAQsFAAOCAYEAln/gaOmUIrUTQpZ3QocbnMAruL5ZrwPxVniAgB3ZvKZ7 f4D2NqEwhcDDx/jb6QdZA3EwGOGBcrAlj4dKmTwCYSdr9wpzgvpSTYrj5Wl9q16X eSecyJFtH/kF8u70I3AoVJt1u5m3cbgTcXfsEqih7iDRR1BABpA9T072o2LNf08B ZrlnG9/Ir2tdlj40saou27Dz/655adEz/xP84ByyXRE8IA+8kC2wEuYiHzvVT9TL h+DW3SRdSJBAEe1ODFXn9BrmR7lw5JxSPzPsRh+5aABhXI1e/6N8dia7IMtCARd0 AjMNnZQuPmNAdf9jybX/k6W3foZV5hLHVUMKArWsdu5lEPScCR8wZlLd6e7DSOSv TtR8CIdMYeA4xbUaTcc+nSk5rQlj0UbgkjJd0WH1EOHFtPzuG6ljmFz85gogfAR8 5EiEMbvA0+i0N83koYTj5FzdgmVXbgmWz0sY8HQx28NwmUG3AG5HXiKYs5mfSNJi MlMNB3WBNoO/vRMFpUxi</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIEKzCCApOgAwIBAgIJALlaaJ0gE1O6MA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNVBAMTE29wZW5zb25hci5jbHMucnUubmwwHhcNMTgxMTA4MDkzODE3WhcNMjMxMTA3 MDkzODE3WjAeMRwwGgYDVQQDExNvcGVuc29uYXIuY2xzLnJ1Lm5sMIIBojANBgkq hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA/F3CuGTdarM3NCVIIv5p6V5xb8+Bv5WZ cX1wmEF8rdNqpa4VVSUC0nIslXbwMhVDDPcCfYCTVYH9PPGn/eaE7ljG8jrm8FjO qOGRUdfNpZMfOXf88KIPBAY9GGBEXYQZY8eK3h8KZZR4dIXsC2in/j8r01uGwG2k es44YIk30n/kpXeInERDJkoj6IPZuYENkxVLdsCSQfc5v2AuSHFOzpM53pIHE+lb 8RRgKCZVgSx6Om5zjDxD9qoWkUUiUFfOxWsqXbmwLaL8JBiELb2YFr/8pES8WX9p QQIcCufczY9HVZtW0H4D3XetqDybPNC8AYD7YyfCRFURehq0nbMOdKNLRYloUQr3 xp/XJuUGBPfYh/3Br9jQMIUbRTxd1PsqIVbWoPIQvPnOaBeu96xwYHJPEX/RMVoV RpmdcDlyphsIGoTkngusa4nnBlVGhj5CfAivP3km3i3pN2/Wllkv7QaIW2shBKwO kkhcT2wRdAQWLTkoP0R0THYW+0fxDS1BAgMBAAGjbDBqMEkGA1UdEQRCMECCE29w ZW5zb25hci5jbHMucnUubmyGKWh0dHBzOi8vc3Aub3BlbnNvbmFyLmNscy5ydS5u bC9zaGliYm9sZXRoMB0GA1UdDgQWBBQt1xh+/scfPMT6aQNA7fGRoUkxgzANBgkq hkiG9w0BAQsFAAOCAYEAln/gaOmUIrUTQpZ3QocbnMAruL5ZrwPxVniAgB3ZvKZ7 f4D2NqEwhcDDx/jb6QdZA3EwGOGBcrAlj4dKmTwCYSdr9wpzgvpSTYrj5Wl9q16X eSecyJFtH/kF8u70I3AoVJt1u5m3cbgTcXfsEqih7iDRR1BABpA9T072o2LNf08B ZrlnG9/Ir2tdlj40saou27Dz/655adEz/xP84ByyXRE8IA+8kC2wEuYiHzvVT9TL h+DW3SRdSJBAEe1ODFXn9BrmR7lw5JxSPzPsRh+5aABhXI1e/6N8dia7IMtCARd0AjMNnZQuPmNAdf9jybX/k6W3foZV5hLHVUMKArWsdu5lEPScCR8wZlLd6e7DSOSvTtR8CIdMYeA4xbUaTcc+nSk5rQlj0UbgkjJd0WH1EOHFtPzuG6ljmFz85gogfAR85EiEMbvA0+i0N83koYTj5FzdgmVXbgmWz0sY8HQx28NwmUG3AG5HXiKYs5mfSNJi MlMNB3WBNoO/vRMFpUxi</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SLO/Artifact"/>
     <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://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onderzoek.zoeken.fame.frl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">CLST Fame | Radboud University</ServiceName>
-      <ServiceName xml:lang="nl">CLST Fame | Radboud Universiteit</ServiceName>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">CLST Fame</ServiceName>
       <ServiceDescription xml:lang="en">Web services and web applications developed and/or maintained by the Centre of Language and Speech technology at the Radboud University.</ServiceDescription>
-      <ServiceDescription xml:lang="nl">Webservices en webapplicaties ontwikkeld en/of onderhouden door het Centre of Language and Speech technology, van de Radboud Universiteit</ServiceDescription>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonTargetedID"/>
-      <RequestedAttribute Name="urn:mace:dir:attribute-def:mail"/>
+      <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="false"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Radboud University</OrganizationName>
-    <OrganizationName xml:lang="nl">Radboud Universiteit</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Radboud University</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="nl">Radboud Universiteit</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.ru.nl/</OrganizationURL>
-    <OrganizationURL xml:lang="nl">https://www.ru.nl/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Henk</GivenName>