--- eduGAIN/https%3A%2F%2Flbr.csc.fi%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Flbr.csc.fi%2Fshibboleth.xml
@@ -2,32 +2,25 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lbr.csc.fi/shibboleth">
   <Extensions>
     <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <RegistrationPolicy xml:lang="en">https://wiki.eduuni.fi/display/CSCHAKA/Joining+and+registrations</RegistrationPolicy>
+      <RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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://refeds.org/category/research-and-scholarship</AttributeValue>
         <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>
-      <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>https://refeds.org/sirtfi</AttributeValue>
       </Attribute>
     </EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <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://lbr.csc.fi/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="fi">Kielipankin oikeudet</DisplayName>
         <DisplayName xml:lang="en">Language Bank Rights</DisplayName>
-        <DisplayName xml:lang="fi">Kielipankin oikeudet</DisplayName>
         <Description xml:lang="fi">Palvelu Kielipankin kielivarojen käyttölupien hakemiseen ja hallintaan.</Description>
         <Description xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</Description>
-        <Logo height="243" width="600">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logo_RGB_600.png</Logo>
-        <InformationURL xml:lang="en">https://www.kielipankki.fi/language-bank/</InformationURL>
-        <InformationURL xml:lang="fi">https://www.kielipankki.fi/</InformationURL>
+        <PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/privacy-policy.html</PrivacyStatementURL>
         <PrivacyStatementURL xml:lang="fi">https://lbr.csc.fi/privacy-policy.html</PrivacyStatementURL>
-        <PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/privacy-policy.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -45,15 +38,15 @@
       <ServiceName xml:lang="en">Language Bank Rights</ServiceName>
       <ServiceDescription xml:lang="fi">Palvelu Kielipankin kielivarojen kayttolupien hakemiseen ja hallintaan.</ServiceDescription>
       <ServiceDescription xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" 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="givenName" Name="urn:oid:2.5.4.42" 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 FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
@@ -73,8 +66,8 @@
     <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>Jaakko</GivenName>
-    <SurName>Leinonen</SurName>
+    <GivenName>Timo</GivenName>
+    <SurName>Mustonen</SurName>
     <EmailAddress>mailto:rems@csc.fi</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
@@ -82,8 +75,4 @@
     <SurName>Matthiesen</SurName>
     <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
   </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>CSC Security Team</GivenName>
-    <EmailAddress>mailto:security@csc.fi</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>