--- DFN-AAI/https%3A%2F%2Fclarino.uib.no%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fclarino.uib.no%2F.xml
@@ -1,69 +1,86 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarino.uib.no/">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-09-28T13:36:32Z">
-      <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://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/feide/single-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/feide/single-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>
-        <InformationURL xml:lang="en">https://clarino.uib.no/iness/page?page-id=refeds_info</InformationURL>
-        <Logo height="65" width="180">https://clarino.uib.no/iness/files/iness-main-page/clarino_duo-180.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://clarino.uib.no/iness/page?page-id=privacy_policy</PrivacyStatementURL>
+        <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">http://clarino.uib.no/iness/page?page-id=privacy_policy</PrivacyStatementURL>
+        <InformationURL xml:lang="en">http://clarino.uib.no/iness/page?page-id=refeds_info</InformationURL>
       </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=University of Bergen,L=Bergen,ST=Vestland,C=NO</X509SubjectName>
+          <X509Certificate>MIIDBTCCAe2gAwIBAgIJAMIPQt0aWk61MA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV BAMMDmNsYXJpbm8udWliLm5vMB4XDTE2MDQyOTEwNTYzNFoXDTIxMDQyODEwNTYz NFowGTEXMBUGA1UEAwwOY2xhcmluby51aWIubm8wggEiMA0GCSqGSIb3DQEBAQUA A4IBDwAwggEKAoIBAQDQaV8AuM08Rjr+ENWQ6jzDnYTU3T4zxK5KubpCT/vTqGB4 7ybNZTNdfSinA4fUVtzMSDhz5aNqFqB9n/2IPV6JjkhZwolR3BVrHhA6Eg4d8j6V Mr7NIF9ZLK47uE5jX2vxNh2y98up843m50J+uUlJ1ucCxouFv/6D+TNWGp85d96u vYsvIgLtgxoD7gnajcJhPjhzuANZfv1fuVHAWG6M2vBWidvXVhgQEZXyEbeZ8n+U +o9XiNx22RR+TADcNKFU6yrrSMPVoSw0m5lTFV2Xt0MiC7GmW8G1YMc1gcchx0KS EcBVM50vRcIflDhSt6/jzq0TQugrcS1HvjCLceEvAgMBAAGjUDBOMB0GA1UdDgQW BBR/rbOCQqrTPMsZN7JT7PmrUqk2ezAfBgNVHSMEGDAWgBR/rbOCQqrTPMsZN7JT 7PmrUqk2ezAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCG040tFSoX q5+CEliWXh8XmmTt6shmOSCqfmy5jt+nExyMSecFAtQL/f+8i3MszjWGmfE7JsMi c8+U7sybyM/Ws8lmkXfW84TzqLWO1ODNu6Jz1718qQyM2XgLkPbG1aTWRw+XBycg yGXBViPopYQbTRAAY+XzccV4N2V+lBD7Z0/JU3d0hruf0lTZlmqyQ3wbMnvw1E2r aAMs/8dp5p0Lz2AZEDNvWj88dmVdnWAt5FbH+oMO6XpzTgBZaU1HhgPXXDNQPbxb eP2rq6Afo70UIhDccaQ9Jex+K2V3mqbyaWF/jDfdPLcO5TE9dT4G+ka8Yq8j0n+D tnB2XWDk7tce</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
           <X509Certificate>MIIEDzCCAvegAwIBAgIUW/ABHxNw+6JByqAchSXdCvuydRMwDQYJKoZIhvcNAQEL BQAwgZYxCzAJBgNVBAYTAk5PMREwDwYDVQQIDAhWZXN0bGFuZDEPMA0GA1UEBwwG QmVyZ2VuMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9mIEJlcmdlbjELMAkGA1UECwwC VUIxFDASBgNVBAMMC1BhdWwgTWV1cmVyMSEwHwYJKoZIhvcNAQkBFhJwYXVsLm1l dXJlckB1aWIubm8wHhcNMjEwNDIwMDczOTI2WhcNMjkwNzA3MDczOTI2WjCBljEL MAkGA1UEBhMCTk8xETAPBgNVBAgMCFZlc3RsYW5kMQ8wDQYDVQQHDAZCZXJnZW4x HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgQmVyZ2VuMQswCQYDVQQLDAJVQjEUMBIG A1UEAwwLUGF1bCBNZXVyZXIxITAfBgkqhkiG9w0BCQEWEnBhdWwubWV1cmVyQHVp Yi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKxB4FbUBjBhcPY ZEKu1/i6aBky3dQqTFdTQAjg2I0hSi+jwoHZiVt1Rf9BAVaH+NXNXT0lbydMOlSM UKAoCPCxYW8lnvtNLigg7M0PiprnBXvlipAtOpUT79Wgh5CpWz3tDmXt0PGLRdz9 a8V+/UIXF6KrQaqsJFzfwzyArXhtqQKINL5jZh2S3JXXD5CM9j4yRm3fTQidMc+d DvP70rD2YWkgth3LnO/soYRC6kDPWHr7MZwcwaaec2qKeE2nW04DSofdHEHnQKGh yDx2lLQTPZuovSjvmjqxzmNB+vTB6rCWU4LYVebzKp27zIzHoDypUcAKfhdrwADG qmYRZjsCAwEAAaNTMFEwHQYDVR0OBBYEFLyudaYXxPTrv25tsMaW1QJKi6qwMB8G A1UdIwQYMBaAFLyudaYXxPTrv25tsMaW1QJKi6qwMA8GA1UdEwEB/wQFMAMBAf8w DQYJKoZIhvcNAQELBQADggEBACsgRCgZxNUqIAtmc4ckrT9gAqJbE6r4dKSMS0cJ JnGzNV+4cBGD52Nizpmi5ZFjmG+kqaXUb+pbuB3rT7tlIqlEQQG0xRchc8NQ1+Bv NuvRMsw/nZnUZT7c5xqb0d0i5PyX9uINyyWG2gmCppx5O71X9rX5FtyNulXIEwO0 JnsusdsJiyg/Y+viorQWyUvn/MZE24tpj6EEsAZUCWKRLZx4IHDr0FltHiAhwLer yTMGWhlYNboODLztUZZl+8/BlQzhrxufOYgLsM7g0gUJ+w6VG0YzDYCqF2mFBq50 Vnj6yaHNpUPCovSNVyxlU55MErDUyyn5LezXK/TBdTw7qDI=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
+    <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/feide/assertion-consumer" index="0"/>
-    <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>
@@ -74,9 +91,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>