--- SURFconext/https%3A%2F%2Fufal-point.mff.cuni.cz%2Fshibboleth%2Feduid%2Fsp.xml
+++ CLARIN IdP/https%3A%2F%2Fufal-point.mff.cuni.cz%2Fshibboleth%2Feduid%2Fsp.xml
@@ -1,46 +1,126 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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://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>
+    </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 AuthnRequestsSigned="1" 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">
-        <Description xml:lang="nl">Instituut van formele en toegepaste taalwetenschappen, Faculteit van Wiskunde en Natuurkunde, Charles Universiteit Praag, Tsjechië (Het aanvragen van deze dienst is automatisch een aanvraag voor alle Clarin diensten)</Description>
-        <Description xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</Description>
+        <DisplayName xml:lang="cs">Repozitář a služby LINDAT/CLARIN</DisplayName>
+        <DisplayName xml:lang="de">LINDAT / CLARIN Dienste</DisplayName>
+        <DisplayName xml:lang="en">LINDAT/CLARIN services</DisplayName>
+        <DisplayName xml:lang="fi">LINDAT / CLARIN palvelut</DisplayName>
+        <Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka</Description>
+        <Description xml:lang="de">LINDAT / CLARIN Digitales Langzeitarchiv und Dienste für die Sprachforschungsinfrastruktur</Description>
+        <Description xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</Description>
+        <Description xml:lang="fi">LINDAT / CLARIN digitaalinen arkisto ja palvelut kielelliseen tutkimusinfrastruktuurin</Description>
+        <DisplayName xml:lang="da">CLARIN-DK-UCPH</DisplayName>
+        <InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</InformationURL>
+        <InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</InformationURL>
+        <PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</PrivacyStatementURL>
         <Logo height="29" width="29">https://lindat.mff.cuni.cz/favicon.ico</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://lindat.mff.cuni.cz/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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>Active</KeyName>
+        <KeyName>https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp</KeyName>
+        <KeyName>lindat.mff.cuni.cz</KeyName>
+        <KeyName>ufal-point.mff.cuni.cz</KeyName>
         <X509Data>
-          <X509Certificate>MIIESzCCArOgAwIBAgIJAPqOpJeFAuJpMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMTEmxpbmRhdC5tZmYuY3VuaS5jejAeFw0xODEyMTAxMjUxMTVaFw0yMzEyMDkxMjUxMTVaMB0xGzAZBgNVBAMTEmxpbmRhdC5tZmYuY3VuaS5jejCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBANDUSi9JHuSus1Fje567Vadc50Q+tD02xhiPR69ro1u3ZZ8/8z0FplneD+4DHoOwiCLstJj8S1Im/5lI5kCtfYYNFoEcPD6s2S8x/wZKuB/51vkSSia/2DuAzqL307yLQw/5Up5wNdwED19tfD/1sriEHgO1CZL+our2hmHgJFDFE/dZF5SouqUIwso1kzyCJbPqn6XM/q23+dhvpViibNfSJgitly4XF4aSkt3yqMSZH1BhWUzu/z2/cqZfcJmC6xa80qM229vLkIdDCg4r4DkJxIDiyz/1USi5V8/KKMVClHPHi70vnyxNx4V1z9Eg2hGEYc8MAXk5/U9DVPB1/cTCaxt/8RS9Q3vSwMquErjfIgUPrD+Z6h1PLgz/7UGsmaJcAg4XJ09gIjDrnt4O6T73iid7zcEklWK4t3+WN/WBQeX8n4DQJJnRMAO/9H7B4MdZyoGnvnlwDRkE0qv0L6mQjQ9MPESUS3sm7034OPVCxaWvjqghj2GNeSPQNo0gGQIDAQABo4GNMIGKMGkGA1UdEQRiMGCCEmxpbmRhdC5tZmYuY3VuaS5jeoIWdWZhbC1wb2ludC5tZmYuY3VuaS5jeoYyaHR0cHM6Ly91ZmFsLXBvaW50Lm1mZi5jdW5pLmN6L3NoaWJib2xldGgvZWR1aWQvc3AwHQYDVR0OBBYEFK0GtVtarb+v+pv+y+v1raIz7PG4MA0GCSqGSIb3DQEBCwUAA4IBgQA0QpOyWdWcHJ+FAhPV64i+PeBW/Mz+mxe+56D9aK8cwK8N77WflgsM9aeJ2cx5KF44frbj4tb3exDJcoB86x23gTk/5s0zAOWctMWzGI+LjnDqGzT91YnADvNrkx9k1EcKtTLqoz2xGsidmYEY2xkOlGjSmEk3Is0dqbGcVpNWs6u7MuIFgajQOPsAjQBJjdcoWnzI3RXNEHfmvjfOVA/rhkqcYRvIX2CX2wr+eCVtOT+4jnuibZOS41n6831vvmaTEGUFKm1RxkRIi4u0msdQNcBLKCJUqiM083sIKnY7I8ag0J7+RGGGOlL0b6dlqIwmH86RWvDzvHfOSamdZK1Jj35m2UyjVE/u8HAKTyXUOAAupHESugXyXuE+gCuXl1KEMNjdZgOvNFCwIIdDEvKqG0Lm/zHM8WLL644ZqSOtLhoetIT6dirneYVDXwyHxuSRec5pEXVA/ZkBYo9ut66MQyj8V1VTRLZnvQY0Bye6UuJFGEJDvVqhSvX9nZ3z2CM=</X509Certificate>
+          <X509SubjectName>CN=lindat.mff.cuni.cz</X509SubjectName>
+          <X509Certificate>MIIESzCCArOgAwIBAgIJAPqOpJeFAuJpMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV BAMTEmxpbmRhdC5tZmYuY3VuaS5jejAeFw0xODEyMTAxMjUxMTVaFw0yMzEyMDkx MjUxMTVaMB0xGzAZBgNVBAMTEmxpbmRhdC5tZmYuY3VuaS5jejCCAaIwDQYJKoZI hvcNAQEBBQADggGPADCCAYoCggGBANDUSi9JHuSus1Fje567Vadc50Q+tD02xhiP R69ro1u3ZZ8/8z0FplneD+4DHoOwiCLstJj8S1Im/5lI5kCtfYYNFoEcPD6s2S8x /wZKuB/51vkSSia/2DuAzqL307yLQw/5Up5wNdwED19tfD/1sriEHgO1CZL+our2 hmHgJFDFE/dZF5SouqUIwso1kzyCJbPqn6XM/q23+dhvpViibNfSJgitly4XF4aS kt3yqMSZH1BhWUzu/z2/cqZfcJmC6xa80qM229vLkIdDCg4r4DkJxIDiyz/1USi5 V8/KKMVClHPHi70vnyxNx4V1z9Eg2hGEYc8MAXk5/U9DVPB1/cTCaxt/8RS9Q3vS wMquErjfIgUPrD+Z6h1PLgz/7UGsmaJcAg4XJ09gIjDrnt4O6T73iid7zcEklWK4 t3+WN/WBQeX8n4DQJJnRMAO/9H7B4MdZyoGnvnlwDRkE0qv0L6mQjQ9MPESUS3sm 7034OPVCxaWvjqghj2GNeSPQNo0gGQIDAQABo4GNMIGKMGkGA1UdEQRiMGCCEmxp bmRhdC5tZmYuY3VuaS5jeoIWdWZhbC1wb2ludC5tZmYuY3VuaS5jeoYyaHR0cHM6 Ly91ZmFsLXBvaW50Lm1mZi5jdW5pLmN6L3NoaWJib2xldGgvZWR1aWQvc3AwHQYD VR0OBBYEFK0GtVtarb+v+pv+y+v1raIz7PG4MA0GCSqGSIb3DQEBCwUAA4IBgQA0 QpOyWdWcHJ+FAhPV64i+PeBW/Mz+mxe+56D9aK8cwK8N77WflgsM9aeJ2cx5KF44 frbj4tb3exDJcoB86x23gTk/5s0zAOWctMWzGI+LjnDqGzT91YnADvNrkx9k1EcK tTLqoz2xGsidmYEY2xkOlGjSmEk3Is0dqbGcVpNWs6u7MuIFgajQOPsAjQBJjdco WnzI3RXNEHfmvjfOVA/rhkqcYRvIX2CX2wr+eCVtOT+4jnuibZOS41n6831vvmaT EGUFKm1RxkRIi4u0msdQNcBLKCJUqiM083sIKnY7I8ag0J7+RGGGOlL0b6dlqIwm H86RWvDzvHfOSamdZK1Jj35m2UyjVE/u8HAKTyXUOAAupHESugXyXuE+gCuXl1KE MNjdZgOvNFCwIIdDEvKqG0Lm/zHM8WLL644ZqSOtLhoetIT6dirneYVDXwyHxuSR ec5pEXVA/ZkBYo9ut66MQyj8V1VTRLZnvQY0Bye6UuJFGEJDvVqhSvX9nZ3z2CM=</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://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/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://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</ServiceName>
+      <ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <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="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="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Pavel</GivenName>
     <SurName>Straňák</SurName>
-    <EmailAddress>stranak@ufal.mff.cuni.cz</EmailAddress>
+    <EmailAddress>mailto:stranak@ufal.mff.cuni.cz</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Jozef</GivenName>
     <SurName>Mišutka</SurName>
-    <EmailAddress>lindat-technical@ufal.mff.cuni.cz</EmailAddress>
+    <EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Jozef</GivenName>
     <SurName>Mišutka</SurName>
-    <EmailAddress>lindat-technical@ufal.mff.cuni.cz</EmailAddress>
+    <EmailAddress>mailto:lindat-technical@ufal.mff.cuni.cz</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>