--- eduGAIN/https%3A%2F%2Fsp.www.kielipankki.fi.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.www.kielipankki.fi.xml
@@ -2,12 +2,16 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.www.kielipankki.fi">
   <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://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>
@@ -20,14 +24,14 @@
         <DisplayName xml:lang="fi">Kielipankki</DisplayName>
         <Description xml:lang="fi">Kielipankin portaali</Description>
         <Description xml:lang="en">Web portal of the Language Bank of Finland</Description>
-        <Logo height="243" width="600">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logo_RGB_600.png</Logo>
-        <Keywords xml:lang="en">Language Bank, Portal</Keywords>
-        <Keywords xml:lang="fi">Kielipankki, portaali</Keywords>
+        <Logo height="58" width="300">https://www.kielipankki.fi/wp-content/uploads/KIELIPANKKI_logotxt_SU_EN.png</Logo>
+        <Keywords xml:lang="fi">Kielipankki, portaali, keskustelufoorumi</Keywords>
+        <Keywords xml:lang="en">Language Bank, Portal, discussion forum</Keywords>
         <InformationURL xml:lang="en">https://www.kielipankki.fi/language-bank/</InformationURL>
+        <InformationURL xml:lang="fi">https://www.kielipankki.fi/</InformationURL>
         <InformationURL xml:lang="sv">https://www.kielipankki.fi/sprakbanken/</InformationURL>
-        <InformationURL xml:lang="fi">https://www.kielipankki.fi/</InformationURL>
+        <PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/privacy-policy/</PrivacyStatementURL>
         <PrivacyStatementURL xml:lang="fi">https://www.kielipankki.fi/tietosuojaseloste/</PrivacyStatementURL>
-        <PrivacyStatementURL xml:lang="en">https://www.kielipankki.fi/data-protection-statement/</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -48,9 +52,7 @@
       <ServiceDescription xml:lang="en">Web portal of 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="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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="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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>