--- eduGAIN/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
@@ -1,41 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:50Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</RegistrationPolicy>
-      <RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</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>
+      </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://aai.dfn.de/require-loa/degree-of-reliance" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>basic</AttributeValue>
+      <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>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://portal.clarin.inl.nl/Shibboleth.sso/Login" index="1"/>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://portal.clarin.inl.nl/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://portal.clarin.inl.nl/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">INT portal - CLARIN services</DisplayName>
         <DisplayName xml:lang="de">INT Portal - CLARIN Dienste</DisplayName>
-        <DisplayName xml:lang="en">INT portal - CLARIN services</DisplayName>
+        <DisplayName xml:lang="fi">INT portaali - CLARIN palvelut</DisplayName>
+        <DisplayName xml:lang="nl">INT portaal - CLARIN diensten</DisplayName>
+        <Description xml:lang="en">Institute for Dutch Language (INT) projects attached to the CLARIN infrastructure.</Description>
         <Description xml:lang="de">Institut für Niederländische Sprache (INT) Projekte im Rahmen der CLARIN-Infrastruktur.</Description>
-        <Description xml:lang="en">Institute for Dutch Language (INT) projects attached to the CLARIN infrastructure.</Description>
-        <Logo height="80" width="165">https://portal.clarin.inl.nl/img/logo-clarin.png</Logo>
+        <Description xml:lang="fi">Institute for Dutch Language (INT) -hankkeita kiinnitetty CLARIN infrastruktuurin.</Description>
+        <Description xml:lang="nl">Instituut voor de Nederlandse taal (INT) diensten en projecten verbonden aan het CLARIN project</Description>
+        <InformationURL xml:lang="nl">http://www.inl.nl/onderzoek-a-onderwijs/projecten/clarin</InformationURL>
         <InformationURL xml:lang="en">http://portal.clarin.inl.nl/</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</PrivacyStatementURL>
+        <Logo height="281" width="500">https://portal.clarin.inl.nl/images/logo_portal.jpg</Logo>
+        <Logo height="9" width="16">https://portal.clarin.inl.nl/images/logo_portal_verysmall.jpg</Logo>
+        <Logo height="85" width="80">https://portal.clarin.inl.nl/images/logo_portal_small.jpg</Logo>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>portal.clarin.inl.nl</KeyName>
         <X509Data>
-          <X509SubjectName>CN=portal.clarin.inl.nl</X509SubjectName>
-          <X509Certificate>MIIF0zCCBLugAwIBAgIRAJdgR10KLsy0dKjBATGOikcwDQYJKoZIhvcNAQELBQAw gY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO BgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UE AxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD QTAeFw0yMDEwMDUwMDAwMDBaFw0yMTExMDUyMzU5NTlaMB8xHTAbBgNVBAMTFHBv cnRhbC5jbGFyaW4uaW5sLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC AQEA0+aRYkAa3xFH0aaP1oDlZPe9O42Y+Y0dgQs++IkfY2OegiJ+GNOPHaPavyow 87LNs6FdwGUIV07Mtw9N7mAxxT6YBDPnyxA+CnfzXb+aU+18VxAeNL6ATzgp6Sci YRNp6AyJ2QzrpLORgb+/ipWyVpgFh1/2eyXcvvnwr59tJrjCI//mb+Kd/7mo171Y Z252bDY36jYUsIk2EZlbLOkHxyLtPViumejz6S0yeE4wLrpstIDX7Axqu136MeNA yLw/cDkiWeFt7gPZChyzcGV6U1AYvAFSeUY05mPTDEXjqTtaoTwfAFXDI3D8h/yQ VtWBSM6soDArv3pEJJkHoYtJ2wIDAQABo4IClzCCApMwHwYDVR0jBBgwFoAUjYxe xFStiuF36Zv5mwXhuAGNYeEwHQYDVR0OBBYEFBt9D3z4cgxgBZsHr0fvyeH/ZnvL MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF BwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgIHMCUwIwYIKwYB BQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECATCBhAYIKwYB BQUHAQEEeDB2ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LnNlY3RpZ28uY29tL1Nl Y3RpZ29SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCMGCCsG AQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTA5BgNVHREEMjAwghRwb3J0 YWwuY2xhcmluLmlubC5ubIIYd3d3LnBvcnRhbC5jbGFyaW4uaW5sLm5sMIIBBQYK KwYBBAHWeQIEAgSB9gSB8wDxAHcAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdo mX4i8NcAAAF0+LI0zgAABAMASDBGAiEAw90cyxycFTmv4cD/+S0nsZ2ZZmt84iLt Hp9iUTX86dYCIQCdLYDfhbeUeMWv9yaSAx/5YlhoE1CDbkETju7Pv8SalAB2AJQg vB6O1Y1siHMfgosiLA3R2k1ebE+UPWHbTi9YTaLCAAABdPiyNPYAAAQDAEcwRQIh APpMNwUDQzn/ieOIAfBBizGyNygou3Au+1ECAFJfW6uzAiAGqz47VTA8VwFedrHT qutecwl8CM6nihgAp/ZXZmTetzANBgkqhkiG9w0BAQsFAAOCAQEA0C4bAMJTLeZG bEP0B/SA1a3kjshtFl9K9ZteiuMTjObXxdGBqR/8xCM8yketenghaHmwKAdSn2Ez 6QfIqn6e0LiAWilnGDb1wxPg87U5sh8iJVhhygTsjv6YFfSP7A1wo3jpKB7L3Nqz U9YWpWUkIiXSysOgWwoUDT3lHRPQaBB+3NueB8lHkvZYIbXZJmSuDFJ+FK8Z7iLV cEuzcZ8Z4Hn135QbFahXPUhv9cqbYNN5olinhP2YUBfvhliiTjyeVkcBLrsn/x5l A6/eSYn3vTnrTTC9FvyB11Opyd5owNLD+wdIzsWrYrzXrlBR054apgbS/DG+K3Lx l5pigavCTQ==</X509Certificate>
+          <X509Certificate>MIIF0zCCBLugAwIBAgIRAJdgR10KLsy0dKjBATGOikcwDQYJKoZIhvcNAQELBQAwgY8xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDE3MDUGA1UEAxMuU2VjdGlnbyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTAeFw0yMDEwMDUwMDAwMDBaFw0yMTExMDUyMzU5NTlaMB8xHTAbBgNVBAMTFHBvcnRhbC5jbGFyaW4uaW5sLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0+aRYkAa3xFH0aaP1oDlZPe9O42Y+Y0dgQs++IkfY2OegiJ+GNOPHaPavyow87LNs6FdwGUIV07Mtw9N7mAxxT6YBDPnyxA+CnfzXb+aU+18VxAeNL6ATzgp6SciYRNp6AyJ2QzrpLORgb+/ipWyVpgFh1/2eyXcvvnwr59tJrjCI//mb+Kd/7mo171YZ252bDY36jYUsIk2EZlbLOkHxyLtPViumejz6S0yeE4wLrpstIDX7Axqu136MeNAyLw/cDkiWeFt7gPZChyzcGV6U1AYvAFSeUY05mPTDEXjqTtaoTwfAFXDI3D8h/yQVtWBSM6soDArv3pEJJkHoYtJ2wIDAQABo4IClzCCApMwHwYDVR0jBBgwFoAUjYxexFStiuF36Zv5mwXhuAGNYeEwHQYDVR0OBBYEFBt9D3z4cgxgBZsHr0fvyeH/ZnvLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgIHMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECATCBhAYIKwYBBQUHAQEEeDB2ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LnNlY3RpZ28uY29tL1NlY3RpZ29SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTA5BgNVHREEMjAwghRwb3J0YWwuY2xhcmluLmlubC5ubIIYd3d3LnBvcnRhbC5jbGFyaW4uaW5sLm5sMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdomX4i8NcAAAF0+LI0zgAABAMASDBGAiEAw90cyxycFTmv4cD/+S0nsZ2ZZmt84iLtHp9iUTX86dYCIQCdLYDfhbeUeMWv9yaSAx/5YlhoE1CDbkETju7Pv8SalAB2AJQgvB6O1Y1siHMfgosiLA3R2k1ebE+UPWHbTi9YTaLCAAABdPiyNPYAAAQDAEcwRQIhAPpMNwUDQzn/ieOIAfBBizGyNygou3Au+1ECAFJfW6uzAiAGqz47VTA8VwFedrHTqutecwl8CM6nihgAp/ZXZmTetzANBgkqhkiG9w0BAQsFAAOCAQEA0C4bAMJTLeZGbEP0B/SA1a3kjshtFl9K9ZteiuMTjObXxdGBqR/8xCM8yketenghaHmwKAdSn2Ez6QfIqn6e0LiAWilnGDb1wxPg87U5sh8iJVhhygTsjv6YFfSP7A1wo3jpKB7L3NqzU9YWpWUkIiXSysOgWwoUDT3lHRPQaBB+3NueB8lHkvZYIbXZJmSuDFJ+FK8Z7iLVcEuzcZ8Z4Hn135QbFahXPUhv9cqbYNN5olinhP2YUBfvhliiTjyeVkcBLrsn/x5lA6/eSYn3vTnrTTC9FvyB11Opyd5owNLD+wdIzsWrYrzXrlBR054apgbS/DG+K3Lxl5pigavCTQ==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -46,20 +48,16 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">INT Portal - CLARIN Dienste</ServiceName>
-      <ServiceName xml:lang="en">INT portal - CLARIN services</ServiceName>
-      <ServiceDescription xml:lang="de">Institut für Niederländische Sprache (INT) Projekte im Rahmen der CLARIN-Infrastruktur.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Institute for Dutch Language (INT) projects attached to the CLARIN infrastructure.</ServiceDescription>
+      <ServiceName xml:lang="en">Autosearch</ServiceName>
+      <ServiceDescription xml:lang="en">Corpus indexing service</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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"/>
     </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="en">Instituut voor Nederlandse Lexicologie (INL)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Instituut voor Nederlandse Lexicologie (INL)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://portal.clarin.inl.nl</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Jan Theo</GivenName>