--- DFN-AAI/https%3A%2F%2Fclarino.uib.no%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fclarino.uib.no%2Fshibboleth.xml
@@ -1,70 +1,81 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarino.uib.no/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2022-01-02T16:04:56Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/fileadmin/documents/mrps_dfn-aai_1.0.pdf</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://clarin.eu/category/clarin-member</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:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>none</AttributeValue>
       </Attribute>
     </EntityAttributes>
+    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
+      <RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</RegistrationPolicy>
+    </RegistrationInfo>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarino.uib.no/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://clarino.uib.no/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">Clarino, UiB</DisplayName>
+        <DisplayName xml:lang="no">Clarino, UiB</DisplayName>
         <DisplayName xml:lang="de">Clarino, UiB</DisplayName>
-        <DisplayName xml:lang="en">Clarino, UiB</DisplayName>
+        <DisplayName xml:lang="fi">Clarino, UiB</DisplayName>
+        <Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</Description>
+        <Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</Description>
         <Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</Description>
-        <Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</Description>
+        <Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</Description>
+        <Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</Logo>
+        <Logo height="106" width="296">https://clarino.uib.no/images/clarino_duo-296.png</Logo>
+        <Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</Logo>
+        <Logo height="231" width="740">https://clarino.uib.no/images/clarino_duo-740.png</Logo>
+        <PrivacyStatementURL xml:lang="en">https://clarino.uib.no/iness/page?page-id=privacy_policy</PrivacyStatementURL>
         <InformationURL xml:lang="en">https://clarino.uib.no/iness/page?page-id=refeds_info</InformationURL>
-        <Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://clarino.uib.no/iness/page?page-id=privacy_policy</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>Paul Meurer</KeyName>
         <X509Data>
-          <X509SubjectName>emailAddress=paul.meurer@uib.no,CN=Paul Meurer,OU=UB,O=UiB,L=Bergen,ST=Vestland,C=NO</X509SubjectName>
           <X509Certificate>MIID7TCCAtWgAwIBAgIUaCMqukxT9z5APQnFAJNvjVdXBVUwDQYJKoZIhvcNAQEL BQAwgYUxCzAJBgNVBAYTAk5PMREwDwYDVQQIDAhWZXN0bGFuZDEPMA0GA1UEBwwG QmVyZ2VuMQwwCgYDVQQKDANVaUIxCzAJBgNVBAsMAlVCMRQwEgYDVQQDDAtQYXVs IE1ldXJlcjEhMB8GCSqGSIb3DQEJARYScGF1bC5tZXVyZXJAdWliLm5vMB4XDTIx MTIyODExMDg1NFoXDTMwMDMxNjExMDg1NFowgYUxCzAJBgNVBAYTAk5PMREwDwYD VQQIDAhWZXN0bGFuZDEPMA0GA1UEBwwGQmVyZ2VuMQwwCgYDVQQKDANVaUIxCzAJ BgNVBAsMAlVCMRQwEgYDVQQDDAtQYXVsIE1ldXJlcjEhMB8GCSqGSIb3DQEJARYS cGF1bC5tZXVyZXJAdWliLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC AQEAumC8vF5SKNugGgIJsps0uFYsHfm7iVoZCAH27XhY+hnp5AUrGx5IQa55IFgi WPPnIeHa3yypwudldIZzKaPNfsD252uRmX0Bb/ZPoKODPrc/So1l1VzrtcvnUk4L V5+SxiZVCgawvZWp8Ih7A+1psEy4iODLfm7GmqpR2z2oWEnMlQziQ6AU4LWIgpNK evlolOZJMTsP1gjxBr3aOLEDFNNTJoZ9TNZFMUaqOyPmpboQSfTv8f/2Mf1j096+ a0KvuyEQqo0tZbM3s4wn+0xdY0A/nMB5T4wf7jdRugR2RhJlBvTCyU6UTTvB11va SvMZyO+Ljsi1VnhjabnH9drHzwIDAQABo1MwUTAdBgNVHQ4EFgQUF20jP/uqoN28 ado+7tLUvUNu75swHwYDVR0jBBgwFoAUF20jP/uqoN28ado+7tLUvUNu75swDwYD VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAHX0jjFm53q4UwwMitvYa Vw9PGqhKwq4KTbb4S9Ok0yTslYaqpc7DONvHvTctkzkmJMdb7eTBGwxby9N3nuVg YBeX23kY/O69BOrvECp44K+t2FN5EWpgqqHYWl1G8Vtr1O2BnWqH8KUgRa730T6O tEpAaQlIR0bW/ccXDUDcN8vGP4hK99Relw6ebS0uC6lCGkIIYMet2Rv6tP+yGfvY cM1XdluguGq9OaQekKSfmvHLQb/3v7dLuHeu2o9bl3pZoB3ZU70tw3HNs8xopF24 tcz/mu96pfFPmL3rk9feXR9Qyosr+yrlnj/j8uQklSfWWoZJSPwv3ZVXCtPaeeIk 3A==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <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://clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarino.uib.no/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarino.uib.no/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarino.uib.no/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AttributeConsumingService index="1">
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="en">Clarino, UiB</ServiceName>
+      <ServiceName xml:lang="no">Clarino, UiB</ServiceName>
       <ServiceName xml:lang="de">Clarino, UiB</ServiceName>
-      <ServiceName xml:lang="en">Clarino, UiB</ServiceName>
+      <ServiceName xml:lang="fi">Clarino, UiB</ServiceName>
+      <ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</ServiceDescription>
+      <ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</ServiceDescription>
       <ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</ServiceDescription>
+      <ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</ServiceDescription>
+      <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="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="cn" Name="urn:oid:2.5.4.3" 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="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="o" Name="urn:oid:2.5.4.10" 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"/>
     </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="no">Universitetet i Bergen</OrganizationName>
+    <OrganizationName xml:lang="en">University of Bergen</OrganizationName>
+    <OrganizationDisplayName xml:lang="no">Universitetet i Bergen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Bergen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="no">http://www.uib.no</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uib.no</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Paul</GivenName>
+    <SurName>Meurer</SurName>
+    <EmailAddress>mailto:clarino-tech@uib.no</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Koenraad</GivenName>
     <SurName>de Smedt</SurName>
@@ -75,9 +86,4 @@
     <SurName>Meurer</SurName>
     <EmailAddress>mailto:clarino-tech@uib.no</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Meurer</SurName>
-    <EmailAddress>mailto:clarino-tech@uib.no</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>