--- eduGAIN/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
+++ CLARIN IdP/https%3A%2F%2Fportal.clarin.inl.nl%2F.xml
@@ -1,37 +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://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://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
-        <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="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,OU=COMODO SSL,OU=Domain Control Validated</X509SubjectName>
-          <X509Certificate>MIIGYDCCBUigAwIBAgIRAIlQXCO4gnjrgg430xQ6alEwDQYJKoZIhvcNAQELBQAw gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg Q0EwHhcNMTcwODAzMDAwMDAwWhcNMjAxMDIzMjM1OTU5WjBXMSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzARBgNVBAsTCkNPTU9ETyBTU0wxHTAb BgNVBAMTFHBvcnRhbC5jbGFyaW4uaW5sLm5sMIICIjANBgkqhkiG9w0BAQEFAAOC Ag8AMIICCgKCAgEA6r0E9cTJpr4t0XY01DRLacQh8P9shEhtL/lYS/Eqzl/hxU9S g3CZErlTQdENiul7+aCCNcmUsc2UpZsA1blBEr9RmvhV3Byf/O7zQ6SbOdG59Wv6 StzHjIBX/Qi/eKdKILXZvsUK1IWJnw9XUx2yf5pmOgD0AJjc7mzjL1rypC1LWvOM SlTYimKSM77UK+EltgwROvCfkpEkcL7VKaaCdAs+smRAJMSHe+EsqY3lq7kg6jXQ 1EBsL4o7W/rp+XF6KXiOknkKBoz11xLrlOlbivkKxpnODHYOw6qXiOjU3JofXVYM 95/is0nHtnrmW7GfHU0hv+50ffe5cUyRiZP8llBzygHs4wrBfoP9ITG8vOBoils9 GwLkUCl9Sr28qJUfFtTUNRyZWQOxv5km+Hq2AFvAKkEiHUiMUzhi3bW6yQt3vYI9 ptzDpT/VA8z6uO5sbSkaCIpOu9oAaXi475cxUi7+Gj1zFqrsECkW1kG1/6D5XGIi RLdl1N4yPN0vvr1O7S8tXXxTk8AMLB/FiCi07ClQ4BWtmpTR7vBfdzeKIVA7rK5H p3veIV2lnx9Ydjzs/WxgFCJakpwFpATGBmdOtdby0YCksZWnB319I6MoFW/hgB3Y HVBryQsr0jLo4NXFHazjvRnv7mV7PgLrMFuSrYJYgC/FTDu8b7MfXv6+FyECAwEA AaOCAeswggHnMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1Ud DgQWBBTRUo4FaGqwbPSfH5Uu9/mxhdkguDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0T AQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTwYDVR0gBEgw RjA6BgsrBgEEAbIxAQICBzArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j b21vZG8uY29tL0NQUzAIBgZngQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDov L2NybC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3Vy ZVNlcnZlckNBLmNybDCBhQYIKwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRw Oi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2Vj dXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9j YS5jb20wOQYDVR0RBDIwMIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0 YWwuY2xhcmluLmlubC5ubDANBgkqhkiG9w0BAQsFAAOCAQEASzLrRHzovPsWnq6r h7cwPGBlmvTxH+shcqmxC/NxEj8KvQ2zuw9nE9cPrHW/zdZUHm8NAIQcn7LLiJHK NL3H6BVT3k+l6FitA/Dff34W0AoM6DNsaUU6fqLK7brRDxz5f0ejhMFxeNLE9Uuh koGTT9xd1pI5RBnj024VpZ24xqRZazke7wTyezMbCQDD1PGbtyzma1oZ3jT56kkU c4M3zZm9cQHrhTKtJTy8v1M2LVR4yOKvgQeipc7jvkDpKRhzTN5y2HSDEyu36QN0 P2wMiAKWphQLmBUXzjwjQsPQkftEd0KaiiAL9aW3bSNEjfbYbVML0GVWq8o8TgvI qM+qoQ==</X509Certificate>
+          <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -42,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>