--- eduGAIN/https%3A%2F%2Fekrksso.keeleressursid.ee%2Fsimplesaml%2Fmodule.php%2Fsaml%2Fsp%2Fmetadata.php%2Fekrk-sp.xml
+++ CLARIN IdP/https%3A%2F%2Fekrksso.keeleressursid.ee%2Fsimplesaml%2Fmodule.php%2Fsaml%2Fsp%2Fmetadata.php%2Fekrk-sp.xml
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/metadata.php/ekrk-sp">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee" registrationInstant="2014-12-06T23:47:48Z">
-      <RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</RegistrationPolicy>
-    </RegistrationInfo>
-    <taat xmlns="http://www.eenet.ee/EENet/urn">
-      <active>yes</active>
-      <AttributeNameFormat/>
-      <modified>2017-10-11T18:57:56Z</modified>
-      <RegistrationInstant2>2014-12-06T23:47:48Z</RegistrationInstant2>
-      <type>saml20-sp</type>
-      <eid>47</eid>
-      <env>prodaccepted</env>
-    </taat>
+    <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>
   </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <Description xml:lang="en">The goal of the Center of Estonian Language Resources (CELR) is to create and manage an infrastructure to make the Estonian language digital resources (dictionaries, corpora – both text and speech –, various language databases) and language technology tools (software) available to everyone working with digital language materials.</Description>
-        <Description xml:lang="et">Eesti keeleressursside keskus (EKRK) on teadustaristu, mis teeb eelkõige teadlastele, kuid ka teistele eesti keele huvilistele kättesaadavaks eesti keele digitaalsed ressursid ja tehnoloogiad (keeletarkvara, sõnastikud, teksti- ja kõnekorpused, keeleandmebaasid).</Description>
+        <DisplayName xml:lang="de">CELR-Dienste</DisplayName>
         <DisplayName xml:lang="en">CELR services</DisplayName>
         <DisplayName xml:lang="et">EKRK teenused</DisplayName>
+        <DisplayName xml:lang="fi">CELR-palvelut</DisplayName>
+        <Description xml:lang="de">CELR-Dienste</Description>
+        <Description xml:lang="en">CELR services</Description>
+        <Description xml:lang="et">EKRK teenused</Description>
+        <Description xml:lang="fi">CELR-palvelut</Description>
+        <InformationURL xml:lang="en">http://keeleressursid.ee/en/</InformationURL>
+        <InformationURL xml:lang="et">http://keeleressursid.ee/et/</InformationURL>
+        <PrivacyStatementURL xml:lang="en">https://wiki.ut.ee/display/keeleressursid/Privacy+Policy+of+Center+of+Estonian+Language+Resources</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -31,20 +31,20 @@
       </KeyInfo>
     </KeyDescriptor>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-logout.php/ekrk-sp"/>
-    <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://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-acs.php/ekrk-sp" index="0"/>
-    <AttributeConsumingService index="1" isDefault="true">
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml1-acs.php/ekrk-sp" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-acs.php/ekrk-sp" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml1-acs.php/ekrk-sp/artifact" index="3"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">CELR services</ServiceName>
       <ServiceName xml:lang="et">EKRK teenused</ServiceName>
-      <ServiceName xml:lang="en">CELR services</ServiceName>
-      <ServiceDescription xml:lang="et">Eesti keeleressursside keskus (EKRK) on teadustaristu, mis teeb eelkõige teadlastele, kuid ka teistele eesti keele huvilistele kättesaadavaks eesti keele digitaalsed ressursid ja tehnoloogiad (keeletarkvara, sõnastikud, teksti- ja kõnekorpused, keeleandmebaasid).</ServiceDescription>
-      <ServiceDescription xml:lang="en">The goal of the Center of Estonian Language Resources (CELR) is to create and manage an infrastructure to make the Estonian language digital resources (dictionaries, corpora – both text and speech –, various language databases) and language technology tools (software) available to everyone working with digital language materials.</ServiceDescription>
-      <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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" 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="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="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="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 Name="eduPersonPrincipalName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="true"/>
+      <RequestedAttribute Name="eduPersonTargetedId" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="o" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
+      <RequestedAttribute Name="mail" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
@@ -56,8 +56,18 @@
     <OrganizationURL xml:lang="et">http://keeleressursid.ee/et/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>TAAT</GivenName>
-    <SurName>Operations</SurName>
-    <EmailAddress>mailto:eenet@eenet.ee</EmailAddress>
+    <GivenName>Mart</GivenName>
+    <SurName>Klanberg</SurName>
+    <EmailAddress>mailto:mart.klanberg@ut.ee</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Mart</GivenName>
+    <SurName>Klanberg</SurName>
+    <EmailAddress>mailto:mart.klanberg@ut.ee</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Krista</GivenName>
+    <SurName>Liin</SurName>
+    <EmailAddress>mailto:krista.liin@ut.ee</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>