--- eduGAIN/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
@@ -1,38 +1,40 @@
 <?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>
     </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"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">INT portal - CLARIN services</DisplayName>
-        <DisplayName xml:lang="en">INT Portal - CLARIN Dienste</DisplayName>
+        <DisplayName xml:lang="en">INT portal - CLARIN services</DisplayName>
+        <DisplayName xml:lang="de">INT Portal - CLARIN Dienste</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="9" width="16">https://portal.clarin.inl.nl/images/logo_portal_verysmall.jpg</Logo>
-        <Logo height="281" width="500">https://portal.clarin.inl.nl/images/logo_portal.jpg</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,OU=InstantSSL Pro,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</X509SubjectName>
-          <X509Certificate>MIIF8zCCBNugAwIBAgIRAOmDjkikKV8bZXBlonKu/E0wDQYJKoZIhvcNAQELBQAw gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD VQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBT ZXJ2ZXIgQ0EwHhcNMTYwODExMDAwMDAwWhcNMTcwOTIzMjM1OTU5WjCB1jELMAkG A1UEBhMCTkwxEDAOBgNVBBETBzIzMTEgQloxFTATBgNVBAgTDFp1aWQtSG9sbGFu ZDEPMA0GA1UEBxMGTGVpZGVuMSEwHwYDVQQJExhNYXR0aGlhcyBkZSBWcmllc2hv ZiAyLTMxMjAwBgNVBAoTKVN0IEluc3RpdHV1dCB2b29yIE5lZGVybGFuZHNlIExl eGljb2xvZ2llMRcwFQYDVQQLEw5JbnN0YW50U1NMIFBybzEdMBsGA1UEAxMUcG9y dGFsLmNsYXJpbi5pbmwubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB AQCvLz7CXK+pmYsVZ5mpj+RoNjBlf3mtfi4yNCPhDkYWCnblbx9Q5YmIPuvhkf2y /U1Knaxg/2bK/k+jR65xvmPB7PYJ1rccUhhwq4W1US6HJjs4g8ZulUlN49sFKfJD a9uJZWaDx/hiZc/wYxtvm2z4sG4Wq6yZ0h/fFefWcqZmb+iTsTfKaaB/NQOQuVY1 3TMqb3HMTaKLLZRILeToVQXtpZlDsKZtZqKG7c/keqERwnUR0GlZf7tYildpXitX FVuBsUsaTT+E/uiCir9vNtjUjdUR37dyFnf770gtnHRjklu0S1cLYxFOi71faNvC SYJejB/wlIS1qCIIqwLXYMOvAgMBAAGjggH4MIIB9DAfBgNVHSMEGDAWgBSa8yva z61Pti+7KkhIKhK3G0LBJDAdBgNVHQ4EFgQUZv15LjjmkGC9RlEs1kfbRdN6JA0w DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH AwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYB BQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBa BgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9S U0FPcmdhbml6YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggr BgEFBQcBAQR/MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29t L0NPTU9ET1JTQU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5j cnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTA5BgNVHREE MjAwghRwb3J0YWwuY2xhcmluLmlubC5ubIIYd3d3LnBvcnRhbC5jbGFyaW4uaW5s Lm5sMA0GCSqGSIb3DQEBCwUAA4IBAQALmuxJdfXfi1vXZc3ebcOLCZAEcIPtoz/f GVKnBwyWLBadv3ubBZOL2qXG4b3OyfnqG1QXY9uG8iTrTq8FSTMV3d4Z5ORUMGC9 Gkn964AqCccDuYnHbNqhOt4Cc5eI8PjgAvEzMs1vXyDJ9RmwbSCp7flKUQqgJQjN VGdzlwSWSNwf9RggP8V4qSYQ0Kj5ik7LUHigNbskq5pnDUkyEIiPcnrd0eknX0nt qLdav4UMegWjLcqQMyl/4drZzpa6iJ5VBoY0Tm+TyGwAE1bvrTGLFEJsWN2ognvY 7hgYhaxp1bITI2kxWrJ6vSX4Gof6D0sq0npLOeO8vkfoVR0C15Xu</X509Certificate>
+          <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -43,20 +45,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 services</ServiceName>
-      <ServiceName xml:lang="en">INT Portal - CLARIN Dienste</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">portal.clarin.inl.nl</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Jan Theo</GivenName>