--- eduGAIN/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
@@ -1,43 +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="urn:oasis:names:tc:SAML:profiles:subject-id:req" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <AttributeValue>none</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://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>
-        <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>
     </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>
-        <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>MIIGSzCCBTOgAwIBAgIQDhB/ScCA3ko3adFQctW+wzANBgkqhkiG9w0BAQsFADCB jzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G A1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQD Ey5TZWN0aWdvIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB MB4XDTIxMTAyNTAwMDAwMFoXDTIyMTEyNTIzNTk1OVowHzEdMBsGA1UEAxMUcG9y dGFsLmNsYXJpbi5pbmwubmwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB AQC+VG5kvGAeERqfm4Hvfn4Icc0yhnKOCPS+yQpgYObZegCxNHDDWXUh+vxyVXuk P73ed2yi6KPAQ+L21R4f40j5i9bZdTYGElC0s88iPT+7A2xlSc/c0A1JiANuAzPd 8dO/u3sXOOvCUULExj+8YdqIU5LnpKQsTZ2PazNXiaFcsvR8upn1lt4t9nADtBB2 xEvD03aWZff4C7wHe77GLzpP73XXW6acOxYyAMHll5L/wC4k/APQfXkhaGR0v22Z a0omEGPULcUPA9QRAiSCMhmUYtDVXmLJ7pHnXJ/tz7WNXHGN6w0gjr7/pHlAjgmu iG3ORX9LIEr5G7YwL24Wdr+vAgMBAAGjggMQMIIDDDAfBgNVHSMEGDAWgBSNjF7E VK2K4Xfpm/mbBeG4AY1h4TAdBgNVHQ4EFgQULtB9EK3XWXnuyFgyrSey3OcA5EQw DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH AwEGCCsGAQUFBwMCMEkGA1UdIARCMEAwNAYLKwYBBAGyMQECAgcwJTAjBggrBgEF BQcCARYXaHR0cHM6Ly9zZWN0aWdvLmNvbS9DUFMwCAYGZ4EMAQIBMIGEBggrBgEF BQcBAQR4MHYwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jcnQuc2VjdGlnby5jb20vU2Vj dGlnb1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwIwYIKwYB BQUHMAGGF2h0dHA6Ly9vY3NwLnNlY3RpZ28uY29tMDkGA1UdEQQyMDCCFHBvcnRh bC5jbGFyaW4uaW5sLm5sghh3d3cucG9ydGFsLmNsYXJpbi5pbmwubmwwggF+Bgor BgEEAdZ5AgQCBIIBbgSCAWoBaAB2AEalVet1+pEgMLWiiWn0830RLEF0vv1JuIWr 8vxw/m1HAAABfLfB1KEAAAQDAEcwRQIhAL1P1wMo33PVI+PVB8po+5lrolkKocfr 3z0nDTw4uCd+AiBq5P2YBS05Qqb8iUzhtasBWP2+v/84aUdtZjN9LOrJhwB2AEHI yrHfIkZKEMahOglCh15OMYsbA+vrS8do8JBilgb2AAABfLfB1KoAAAQDAEcwRQIh AJj1Ppw3o48GUpqA6csevAe1N6zBnojDEB4ZyIQnvo3FAiAuMGMkAg2g7FJndReU asItSQCBN93uF2fS1/PJTXXVEQB2ACl5vvCeOTkh8FZzn2Old+W+V32cYAr4+U1d JlwlXceEAAABfLfB1IMAAAQDAEcwRQIgZaYMstTAxpLZGcfSgnxRtVN+mFid27/0 aTpZzddXex8CIQCsjWLt/0g1jR6DTkQqtxqydaPB9vMCjzirP7m2dxojFDANBgkq hkiG9w0BAQsFAAOCAQEAKSdFaKNsK56yTJrs7iZyW0V5AJTxhUJYSkl6u+/abnjY jXYVaQCjY6Zzj/7fsdlNo7vXWOYZBzfYNfuWXcBbGI/PkB9dQYuIiIHRJBqsavb5 Jvr4qry1R3MpMtimddnBv8mhB1VMzrY10l5ttt9Tp2hg69l2wQ6qyLKIrhqwpcoC NHC3FMGIIWX2Kn0vWie9+WLBqi4/0nPeSaciKXCef77c0yHMGSxoXAQiw4UKgAzw bIVdAuxNPzped7B8Wclx1v6LQyCW+Vfw7JRHVUX36686VW7AEBRW4MQ5dsou8wWD JEvkjFamq4KtZu5ORwCDdUXC2B5g5n20p0lpcL0ERw==</X509Certificate>
+          <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -45,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 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>