--- eduID.cz/https%3A%2F%2Fsp.clarin.si%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.clarin.si%2F.xml
@@ -1,32 +1,72 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.clarin.si/">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:24:11Z">
-      <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>
     </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="en">CLARIN.SI Repository</DisplayName>
+        <Description xml:lang="en">CLARIN.SI: Digital repository and services of the Slovenian CLARIN RI at the Jožef Stefan Institute</Description>
+        <DisplayName xml:lang="sl">CLARIN.SI repozitorij</DisplayName>
+        <Description xml:lang="sl">CLARIN.SI: Digitalni repozitorij in storitve slovenske RI CLARIN na Institutu »Jožef Stefan«</Description>
+        <DisplayName xml:lang="fr">CLARIN.SI Repositoire</DisplayName>
+        <Description xml:lang="fr">CLARIN.SI: Repositoire et services CLARIN, Institut Jožef Stefan</Description>
+        <DisplayName xml:lang="de">CLARIN.SI Dienste</DisplayName>
+        <Description xml:lang="de">CLARIN.SI: Digitale Langzeitarchiv CLARIN, Institut Jožef Stefan</Description>
+        <InformationURL xml:lang="en">http://www.clarin.si/</InformationURL>
+        <Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</Logo>
+        <Keywords xml:lang="en">Slovenian Slovene digital repository language research corpora tools</Keywords>
+        <Keywords xml:lang="sl">slovenski digitalni repozitorij jezikovne raziskave korpusi korpusna orodja</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.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://www.clarin.si/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.clarin.si/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">CLARIN.SI Dienste</DisplayName>
-        <DisplayName xml:lang="en">CLARIN.SI Repository</DisplayName>
-        <Description xml:lang="de">CLARIN.SI: Digitale Langzeitarchiv CLARIN, Institut Jožef Stefan</Description>
-        <Description xml:lang="en">CLARIN.SI: Digital repository and services of the Slovenian CLARIN RI at the Jožef Stefan Institute</Description>
-        <InformationURL xml:lang="en">http://www.clarin.si/</InformationURL>
-        <Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.html</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
+    <KeyDescriptor>
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>fido</KeyName>
+        <X509Data>
+          <X509SubjectName>CN=fido</X509SubjectName>
+          <X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV BAMTBGZpZG8wHhcNMTQwNDI0MTAyODAyWhcNMjQwNDIxMTAyODAyWjAPMQ0wCwYD VQQDEwRmaWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAru0HRu+t qyjRI6Y07bMruUz39rZbESeIekqt7LFe3RuowbYwYuwZEC0wHwFSheDgV70Q/sDs yAKt7OSCH5seVHFE9bmWY2cXIATnsP90+ijPkdA/zXFoOvibeTqNwbIQ5qZ1cQ2e dFL2tL2PVC9W0BFS/QYK79sdIHSS+7zwCWU5kMsrCKlJ2+3ZfQRTAaYBp5yYcm+B wzHW5euFN9nvAruagvSnEDI42PzpjeT+S4yPKxTEkj+w68kMnm6KFzW8K9aHt1N0 SKKRrZYKwqPF3yDbLIhEDZPHwV23fXax6qfW//shIkhYzfs6xuaBOFI86IgR11oM 024XBCKg+gCAcQIDAQABozIwMDAPBgNVHREECDAGggRmaWRvMB0GA1UdDgQWBBSF K2aqnNGBq9YIqrRYWcx+P16fPDANBgkqhkiG9w0BAQUFAAOCAQEAPWauwmt3vKhb EMPdWMSltr7QzCnbwqrDDbI7e+oRJXlh/rfyYSshEWyF+9in+14InvK5Me9nL9jr 4OIkjuceC5EbYhthkzoaFneYOJ9CFX5clvLKqSK7lWLl94YxJcvK7pcWPu3bb4th Z7LENHPrlaHEYWI7Gz0RiFi2Mk21S8S2aH0Av6yP0giylAK3RFQklZD/WejQh5xG nEAEQtr4mtLzJO8yC8mQrT89tUNW7Uj6D84YO9q57BbdugNew7Zb90z359GqjMDZ p4E2ZJZF5NWCFiPdJTBoNtMPngEHxcgYsDQefnJAk3YTKzkWXT/sqx8cRPLJXpYk +Xb2ywjVWg==</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>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <KeyName>CLARIN.si</KeyName>
@@ -35,53 +75,73 @@
           <X509Certificate>MIIFVzCCAz+gAwIBAgIEATTYIzANBgkqhkiG9w0BAQsFADBDMQswCQYDVQQGEwJT STESMBAGA1UEBwwJTGp1YmxqYW5hMQwwCgYDVQQKDANJSlMxEjAQBgNVBAMMCUNM QVJJTi5zaTAeFw0yNDA0MTkwNjM0NTRaFw0yNjA0MDkwNjM0NTRaMEMxCzAJBgNV BAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExDDAKBgNVBAoMA0lKUzESMBAGA1UE AwwJQ0xBUklOLnNpMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArOjb AES3Onv55CXRnWeZyjqlZyFnlZuVcprhRIFB19OgaF1+MxqI5yHJcG+GKId8YDxT fnGOo2+p6DGAfs3czxOqXRlPJUFj08IrOYHDYFb3lOTST58K4ekWUEmoSeV2HvZC ifpzENqaXR1a7XhXbk3bTorenu2RVmvMzxm0OoCmXqpJkGBphwKk13Pn4Fu6FvBe RcKnnme/xyY67flRa0hxwCy3D7FTC4rKevKnO2C3cJX0F9us8dbZiZhVfpaKbAFs buMaou1QL3WQTH92zCQKeyulf7qRaA8cpNjBrb7zo2hO40T8sXaItDf0ZI+ySnjC cLNo5DzFjgG1Qy7uc88wukrYGf81trl8ORK9wjcVsCRrc1dmYRk4HvcKuC9cNAtH 8yo5y+VVat3qB2RAQNtUZ+XxqDcgrR2lxkAA2bzQ4NXFFAkE6GRwSptq2QTLVRcC UQob0Kpdpxcno5INTToC2aEr0Y8zCMmIRvRJJk8RUyiY0A7i2cIPJUskXFvfvdG4 4Mux5aqdan0z/YWCgkX8K0/Qad0vWoE2XiYX9b72zeeNfMpxPUFe6oXYzwHNGJ3a xkX2opqspL/7j2t8fMCV82ouxDlPQVWQSmP8RcWcpqYOBjXM+7OhjT1CR6VHeLQb 7eZ34Q0AmZkb3o1+piIm6zMfQDPv/u5aBbR7E0MCAwEAAaNTMFEwHQYDVR0OBBYE FIoohq0z0Ow7kChC8UolqnPyujemMB8GA1UdIwQYMBaAFIoohq0z0Ow7kChC8Uol qnPyujemMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAEpbfsE9 pPlNT3RxBQVbPqp+qUYoFNrIfdv9/oVDaXjC+5UD+6+jWR7VeX5QBWPtlSL6VHi5 tm+0s/S1CKVHOEL06IeRq75vOWWL1l0tSN3n7qH/qs76EHkXj9bdQf/PNaiOPkMA q6GgjO7C/zcK/DYf1XcS6A6R9tPBAR0Nkqxc9MfW/HooTenbF4PKt+FSfOyOZ3x7 ErrvexfzrNVvdipmuk2mhJ1At5UttTgVQk9M6NWt5I2XnYwqqj/xHb/DS7IbenNk s/Oz/qRks8Jk9ZqHjTvsRrN/gB5wd4S7hYTV5i1WzPRJQHzA1c42o+G3jVRR7/9b /EJb1Xkxcqj61nsyfS1qE/fT6c5IhqqeTrpt9jLeV7BHGJXURC1PQp/yfXzrVB3P VU2KDRPDPsEMlzWtxKjHlXPIGZhWzadvj9Piu3ZgFzzrWYoJSHpK1vsnHdDg81iT ZdNbNFsfLsuQOoe2bhULHSop4h6ONPNXASLaogH+IaAY3V8AzJM3Vykyh1z2l6Uj jxRdqsEOQF5RkXNTyg5qrTaQXb+utAROsuZWFf+/fUZ29lvNPCkKPGWptRu0Lp/d H6hKeIRE916I3WhjF2AHsmMmaFloGLXdPCc3lu8SQDp/ArcG1CdYKQwwYnXABbBs Kni55lI+Z0yAx7qLpH3ouqmBBia93it84t4U</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.clarin.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.clarin.si/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.clarin.si/Shibboleth.sso/SLO/SOAP"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.clarin.si/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clarin.si/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clarin.si/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">CLARIN.SI Dienste</ServiceName>
-      <ServiceName xml:lang="en">CLARIN.SI Repository</ServiceName>
-      <ServiceDescription xml:lang="de">CLARIN.SI: Digitale Langzeitarchiv CLARIN, Institut Jožef Stefan</ServiceDescription>
-      <ServiceDescription xml:lang="en">CLARIN.SI: Digital repository and services of the Slovenian CLARIN RI at the Jožef Stefan Institute</ServiceDescription>
+      <ServiceName xml:lang="en">CLARIN.SI Digital Repository and Services</ServiceName>
+      <ServiceName xml:lang="sl">Digitalni repozitorij in storitve CLARIN.SI</ServiceName>
+      <ServiceName xml:lang="de">Digitale Langzeitarchiv und Dienste CLARIN.SI</ServiceName>
+      <ServiceDescription xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</ServiceDescription>
+      <ServiceDescription xml:lang="sl">CLARIN.SI: Digitalni repozitorij in storitve raziskovalne infrastrukture za jezikovne vire in tehnologije CLARIN na Institutu »Jožef Stefan«, Ljubljana, Slovenija</ServiceDescription>
+      <ServiceDescription xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</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="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="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="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="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="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="sn" Name="urn:oid:2.5.4.4" 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="en">Jožef Stefan Institute, Ljubljana, Slovenia</OrganizationName>
+    <OrganizationName xml:lang="sl">Institut »Jožef Stefan«, Ljubljana, Slovenija</OrganizationName>
+    <OrganizationName xml:lang="de">Jozef Stefan Institut, Ljubljana, Slovenija</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Jožef Stefan Institute</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sl">Institut »Jožef Stefan«</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="de">Jozef Stefan Institut</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ijs.si/</OrganizationURL>
+    <OrganizationURL xml:lang="sl">http://www.ijs.si/</OrganizationURL>
+    <OrganizationURL xml:lang="de">http://www.ijs.si/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tomaž</GivenName>
-    <SurName>Erjavec</SurName>
-    <EmailAddress>mailto:repo-admin@clarin.si</EmailAddress>
+  <ContactPerson contactType="technical">
+    <GivenName>Jan Jona</GivenName>
+    <SurName>Javoršek</SurName>
+    <EmailAddress>mailto:repo-technical@clarin.si</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Jan Jona</GivenName>
     <SurName>Javoršek</SurName>
     <EmailAddress>mailto:repo-help@clarin.si</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jan Jona</GivenName>
-    <SurName>Javoršek</SurName>
-    <EmailAddress>mailto:repo-technical@clarin.si</EmailAddress>
+  <ContactPerson contactType="administrative">
+    <GivenName>Tomaž</GivenName>
+    <SurName>Erjavec</SurName>
+    <EmailAddress>mailto:repo-admin@clarin.si</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>