--- DFN-AAI/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="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://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>
-      <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>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="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>
+        <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>
-        <Logo height="80" width="165">https://portal.clarin.inl.nl/img/logo-clarin.png</Logo>
         <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>MIIGTTCCBTWgAwIBAgIQGZ29Z/6eEKf3fUSOJBVu9TANBgkqhkiG9w0BAQsFADCB jzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G A1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQD Ey5TZWN0aWdvIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB MB4XDTIzMDkyNTAwMDAwMFoXDTI0MTAyNTIzNTk1OVowHzEdMBsGA1UEAxMUcG9y dGFsLmNsYXJpbi5pbmwubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB AQDalpwTpwom1Me56gd8Oo0jkVRUNddtRVYBVyfvZcIjeKwZGN8QBPEJNU4uFgPU OfZ//rKD81ptgqQvv9Ng7MP9QnJXOqbXD3tOQbwfUcXi+mFCPzQ/O30tWnr4UUkT Cuk4iVKSsa5RBrVI4LBRLm5e555h5VOEWQgWiLWzoPJtH4BQy5U676TzOoR0im4c nlszhR8iBbsqjh3QYPVUukP2ytEVJXLA09z5rmwgCu8R5iVKFV3WBci1eTLO2EPc UnPLzFLbvB5sSssyemF+2454fP9s61B43O//GMB2KaiYH8R7BXoUtn/2Cqk9RtnW 2bMNuiyFq/QtbuHsBLndomblAgMBAAGjggMSMIIDDjAfBgNVHSMEGDAWgBSNjF7E VK2K4Xfpm/mbBeG4AY1h4TAdBgNVHQ4EFgQUJcpxRISBHVk8LnmWXCqMjC0Uv+Qw DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH AwEGCCsGAQUFBwMCMEkGA1UdIARCMEAwNAYLKwYBBAGyMQECAgcwJTAjBggrBgEF BQcCARYXaHR0cHM6Ly9zZWN0aWdvLmNvbS9DUFMwCAYGZ4EMAQIBMIGEBggrBgEF BQcBAQR4MHYwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jcnQuc2VjdGlnby5jb20vU2Vj dGlnb1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwIwYIKwYB BQUHMAGGF2h0dHA6Ly9vY3NwLnNlY3RpZ28uY29tMDkGA1UdEQQyMDCCFHBvcnRh bC5jbGFyaW4uaW5sLm5sghh3d3cucG9ydGFsLmNsYXJpbi5pbmwubmwwggGABgor BgEEAdZ5AgQCBIIBcASCAWwBagB3AHb/iD8KtvuVUcJhzPWHujS0pM27KdxoQgqf 5mdMWjp0AAABisvpqpcAAAQDAEgwRgIhAJQ0+sC0oDeUQNd4alitHeL3rZgVLXjl HmX3EyMQcScuAiEA89GN2Cqxm1Mfi0WYuNhfB0a3bphXPvflAMaE+csteb8AdgDa tr9rP7W2Ip+bwrtca+hwkXFsu1GEhTS9pD0wSNf7qwAAAYrL6asBAAAEAwBHMEUC IQDRZNdtxruxtscf9jqn93SrLxxNgK8Lo5XwHMpHKWcMtQIgXp864t7hqvPyOCyf wkDxE8VBVtmPLYibiFSPd/NDsTsAdwDuzdBk1dsazsVct520zROiModGfLzs3sNR SFlGcR+1mwAAAYrL6arIAAAEAwBIMEYCIQDj94bNvRwPpmWgTVepP8qs+L1X6Zlt 7TK34I6wN83VOAIhAIckt51pDoCveXVqAK3TtPduDmMHUR3qDRyMDxhuLut8MA0G CSqGSIb3DQEBCwUAA4IBAQAmAqHnJ+rL0sIiisR2IULwQDyWztHFHtm2UYCVnbmj JvjMdWg3TYKJX13K5HKwoXp6QIwPE9sNtEY9TVJVGC4ZLUmBJEbiYYM+ScGknfVQ bYSJ6gf8uChmVPqdXhEsCfo6wiFkbCBQR1Vio+Dhbn5deugI40C+JqmqconYW4rG ufgzC/WeAKIDGJ6UFOj166x+nFcDLTA6IdQbivo5OUK4B/JP/49PmbFOWQw+vyv6 RGWqSxT7WX4QBfekURqGXkhaJUSGS4o7MoZ52JlhMzJjDgdiGYEStECtWLFRwmQx 9wjMx6+NrCpOYdS/z03Log/2LdVlCwvMHmQBJHU56Q/j</X509Certificate>
+          <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -43,21 +45,19 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <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 de Nederlandse Taal (INT)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Instituut voor de Nederlandse Taal (INT)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://portal.clarin.inl.nl</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>Karin</GivenName>