--- SURFconext/https%3A%2F%2Fsp.mpi.nl.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.mpi.nl.xml
@@ -1,41 +1,95 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.mpi.nl">
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <Extensions>
+    <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>
+    </EntityAttributes>
+  </Extensions>
+  <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>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <Description xml:lang="nl">Service Provider for Data and Services hosted at the Max Planck Institute for Psycholinguistics</Description>
+        <DisplayName xml:lang="en">MPI for Psycholinguistics</DisplayName>
+        <DisplayName xml:lang="nl">MPI voor Psycholinguïstiek</DisplayName>
+        <DisplayName xml:lang="de">MPI für Psycholinguistik</DisplayName>
+        <DisplayName xml:lang="fi">MPI Psykolingvistiikan</DisplayName>
         <Description xml:lang="en">Service Provider for Data and Services hosted at the Max Planck Institute for Psycholinguistics</Description>
+        <Description xml:lang="nl">Service Provider voor Data en Diensten gehost bij het Max Planck Instituut voor Psycholinguïstiek</Description>
+        <Description xml:lang="de">Service Provider für Daten und Dienstleistungen am Max-Planck-Institut für Psycholinguistik</Description>
+        <Description xml:lang="fi">Palveluntarjoaja tietoja ja palveluista, jotka isännöi Max Planck Instituutti Psykolingvistiikan</Description>
+        <Keywords xml:lang="en">Max+Planck+Institute Psycholinguistics Language Research Data Services</Keywords>
+        <Keywords xml:lang="nl">Max+Planck+Instituut Psycholinguïstiek Taal Onderzoeksdata Diensten</Keywords>
+        <Keywords xml:lang="de">Max-Planck-Institut Psycholinguistik Sprache Forschungsdaten Dienstleistungen</Keywords>
+        <Keywords xml:lang="fi">Max+Planck+Instituutti Psykolingvistiikan Kieli Tutkimustiedot Palvelut</Keywords>
         <Logo height="495" width="500">https://sp.mpi.nl/gif/mpg-logo-500.png</Logo>
+        <Logo height="89" width="90">https://sp.mpi.nl/gif/mpg-logo-90.png</Logo>
+        <InformationURL xml:lang="en">http://www.mpi.nl</InformationURL>
+        <PrivacyStatementURL xml:lang="en">https://sp.mpi.nl/privacy/privacy_statement.html</PrivacyStatementURL>
       </UIInfo>
+      <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.mpi.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://sp.mpi.nl/Shibboleth.sso/Login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
           <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Data and Services</ServiceName>
+      <ServiceDescription xml:lang="en">Research Data and Services hosted at the Max Planck Institute for Psycholinguistics</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">e459</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CLARIN ERIC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://clarin.eu</OrganizationURL>
+    <OrganizationName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationName>
+    <OrganizationName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</OrganizationName>
+    <OrganizationName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationName>
+    <OrganizationName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl/</OrganizationURL>
+    <OrganizationURL xml:lang="nl">http://www.mpi.nl/nederlands</OrganizationURL>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl/deutsch</OrganizationURL>
+    <OrganizationURL xml:lang="fi">http://www.mpi.nl/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Tobias</GivenName>
     <SurName>van Valkenhoef</SurName>
-    <EmailAddress>shibboleth@mpi.nl</EmailAddress>
+    <EmailAddress>mailto:shibboleth@mpi.nl</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Tobias</GivenName>
     <SurName>van Valkenhoef</SurName>
-    <EmailAddress>shibboleth@mpi.nl</EmailAddress>
+    <EmailAddress>mailto:shibboleth@mpi.nl</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <GivenName>Tobias</GivenName>
     <SurName>van Valkenhoef</SurName>
-    <EmailAddress>shibboleth@mpi.nl</EmailAddress>
+    <EmailAddress>mailto:shibboleth@mpi.nl</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>