--- ACOnet/https%3A%2F%2Farchive.mpi.nl.xml
+++ CLARIN IdP/https%3A%2F%2Farchive.mpi.nl.xml
@@ -1,79 +1,98 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://archive.mpi.nl">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2018-01-29T16:09:54Z">
-      <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>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">MPI-PL Archive</DisplayName>
+        <DisplayName xml:lang="nl">MPI-PL Archief</DisplayName>
+        <DisplayName xml:lang="de">MPI-PL Archiv</DisplayName>
+        <DisplayName xml:lang="fi">MPI-PL Arkiston</DisplayName>
+        <Description xml:lang="en">Research data archive at the Max Planck Institute for Psycholinguistics</Description>
+        <Description xml:lang="nl">Archief met onderzoeksdata bij het Max Planck Instituut voor Psycholinguïstiek</Description>
+        <Description xml:lang="de">Forschungsdatenarchiv am Max-Planck-Institut für Psycholinguistik</Description>
+        <Description xml:lang="fi">Max Planckin Psykolingvistiikan Instituutin tutkimustietokannasta</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">https://archive.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://archive.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://archive.mpi.nl/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">MPI-PL Archiv</DisplayName>
-        <DisplayName xml:lang="en">MPI-PL Archive</DisplayName>
-        <Description xml:lang="de">Forschungsdatenarchiv am Max-Planck-Institut für Psycholinguistik</Description>
-        <Description xml:lang="en">Research data archive at the Max Planck Institute for Psycholinguistics</Description>
-        <InformationURL xml:lang="en">https://archive.mpi.nl</InformationURL>
-        <Logo height="495" width="500">https://sp.mpi.nl/gif/mpg-logo-500.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://sp.mpi.nl/privacy/privacy_statement.html</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>sp.mpi.nl</KeyName>
         <X509Data>
-          <X509SubjectName>CN=sp.mpi.nl,O=Max-Planck-Gesellschaft zur Förderung der Wissenschaften e.V.,ST=Bayern,C=DE</X509SubjectName>
+          <X509Certificate>MIIHsDCCBZigAwIBAgIRAK68IPIMTAzijH2Mi72YTw8wDQYJKoZIhvcNAQEMBQAwRDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIyMDIwODAwMDAwMFoXDTIzMDIwODIzNTk1OVowga8xCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZCYXllcm4xRzBFBgNVBAoMPk1heC1QbGFuY2stR2VzZWxsc2NoYWZ0IHp1ciBGw7ZyZGVydW5nIGRlciBXaXNzZW5zY2hhZnRlbiBlLlYuMTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1ZXIgUHN5Y2hvbGluZ3Vpc3RpazESMBAGA1UEAxMJc3AubXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzC4CF9XH+P3a97mwn/BOL4oA1m5R5YFPSPlqA1X2Aa9Xlo4Q7qFcr5jKU7YkmG3dslYm0OLvWAUju8TDdGC0wjbEVZQmhMYQ/0erg3B4k/3Cj48z9SRJswku15/e5RVKr/6q5wxgvkbhMCQ6yFqo9GA3vxOyL3Dn7FJ8ZfycjVtiJ35Z7PKuWTDllZaVKXUHte1q/6poe6/IT7+nEnO+LKZKPDirAWccbKgy+1MhU98fibWALGvgJJb7paB3rM6BoOxcTb3RZtrTSyOALIoUzEDNlCpfgL0u9xOFot8u+84UyflNbIW9AegHKHtI3ARk09n4OdGNMwyiqA0IUZEr2QIDAQABo4IDLzCCAyswHwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFFmCYNUJ7eqP4Uc76EFbsXobxPhsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNlY3RpZ28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6BggrBgEFBQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5jb20wggGBBgorBgEEAdZ5AgQCBIIBcQSCAW0BawB3AK33vvp8/xDIi509nB4+GGq0Zyldz7EMJMqFhjTr3IKKAAABfti/9w4AAAQDAEgwRgIhAMkTNPIFv9tvWRpE2aY9uMZsQX5HhoBtQl4Dr87k5HUnAiEA4TMpk5SeP9DU8HcZlHfCq9CT9796z6lL4XMe5Gyo3y0AdwB6MoxU2LcttiDqOOBSHumEFnAyE4VNO9IrwTpXo1LrUgAAAX7Yv/bNAAAEAwBIMEYCIQDLtwYGZu6xg6B+3mj082C3kTGUaRM+hl14PaH1O9dXnAIhAL3FTqyLW8vEbTqtSxn/TKI1wWUyrrhGk7ed3WVhabg9AHcA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3fW0GvW4AAAF+2L/2pQAABAMASDBGAiEA2fMfuqVAG7JKpIxeEXTmjAHyyHO1jUwIu4hJT5FyWAUCIQDEqgFfsRJeC2GMntmxJ2Kn61YepYnGFpMzu/5+ZvfBKzAkBgNVHREEHTAbgglzcC5tcGkubmyCDmFyY2hpdmUubXBpLm5sMA0GCSqGSIb3DQEBDAUAA4ICAQBdke9ZeiedoRGqcc6zpwI/DMfR9UWdwciohE7L8mTnizUd7RPCZYD6vyTu5ECJJ4aIQba3zF6D5lNpNhkPnyUgR2q8mDe7eiypRe92VOuVuujSthtX6PDvlxfgdFGMy1CXPhnqSYgypK5kpz/ThxlhszT534hp1rISL6iZstQ3OaKCiWHdWSqaLAFMiqceuTzRmoCA7SPCvBbruxLShm4gZkHu6S+8Uz/5jYodJL7RhhJnMCM+Tp++/qUBM1xnL4rA/vr5gLZ6vBD7+s/3MPU+mhD5tjRlaoMKdy2kdFl4tsuQxm0l9GPrOBl3GZi3+0cISVwW1EmS5uNBjiR5R3CVESmEa4bd1pBR3kjwzpSoyRE9VzaQCciJVTICW5OrQt9MzT06Ljcg9nMmJlLlQ5ddYOWAHv5+RnlBUGoAVuaQZ5g1r7Cv+Rm2hsYewAYlcKJ61EthvMzYVn+mOswXHXbDc7bi5gVM+4/TX/1TUbLQLKRpf0DHZMGLRlKNWWPLzzrmVWmirK7gftcgTJ2aw/BEMfkFw0Zy3Wua8eGsKB1AApnvc3y9Ja9+mCD/amBVNKS4w8owOaqiNb0RkkJmQKjd2kW8VofGFqBPtwwWz8DGpJpyvh4rXCm/bgh3HI1ASZkLUMcU2XLDpWRW1GEd9XCFLtp2pu9J+nOCwTtrOHBjsQ==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
           <X509Certificate>MIIHdjCCBV6gAwIBAgIQIjDdSbL1CR4OsjcnV9Jm9TANBgkqhkiG9w0BAQwFADBE MQswCQYDVQQGEwJOTDEZMBcGA1UEChMQR0VBTlQgVmVyZW5pZ2luZzEaMBgGA1UE AxMRR0VBTlQgT1YgUlNBIENBIDQwHhcNMjMwMTEwMDAwMDAwWhcNMjQwMTEwMjM1 OTU5WjB7MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5ZXJuMUcwRQYDVQQKDD5N YXgtUGxhbmNrLUdlc2VsbHNjaGFmdCB6dXIgRsO2cmRlcnVuZyBkZXIgV2lzc2Vu c2NoYWZ0ZW4gZS5WLjESMBAGA1UEAxMJc3AubXBpLm5sMIIBIjANBgkqhkiG9w0B AQEFAAOCAQ8AMIIBCgKCAQEAzC4CF9XH+P3a97mwn/BOL4oA1m5R5YFPSPlqA1X2 Aa9Xlo4Q7qFcr5jKU7YkmG3dslYm0OLvWAUju8TDdGC0wjbEVZQmhMYQ/0erg3B4 k/3Cj48z9SRJswku15/e5RVKr/6q5wxgvkbhMCQ6yFqo9GA3vxOyL3Dn7FJ8Zfyc jVtiJ35Z7PKuWTDllZaVKXUHte1q/6poe6/IT7+nEnO+LKZKPDirAWccbKgy+1Mh U98fibWALGvgJJb7paB3rM6BoOxcTb3RZtrTSyOALIoUzEDNlCpfgL0u9xOFot8u +84UyflNbIW9AegHKHtI3ARk09n4OdGNMwyiqA0IUZEr2QIDAQABo4IDKzCCAycw HwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegwwHQYDVR0OBBYEFFmCYNUJ 7eqP4Uc76EFbsXobxPhsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQB sjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgG BmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vR0VBTlQuY3JsLnNlY3Rp Z28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUFBwEBBGkwZzA6BggrBgEF BQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNvbS9HRUFOVE9WUlNBQ0E0 LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9jc3Auc2VjdGlnby5jb20w ggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB2AHb/iD8KtvuVUcJhzPWHujS0pM27 KdxoQgqf5mdMWjp0AAABhZkdmMEAAAQDAEcwRQIgUa0UmgguYoo3d2X8CA9hcOj7 R6X0PEKj0JErkmjiRKkCIQC/eaEbgM6zjSTK/PBTwYQ/2Ozq6E5zDHVyxoNZhr/o JgB1ANq2v2s/tbYin5vCu1xr6HCRcWy7UYSFNL2kPTBI1/urAAABhZkdmKoAAAQD AEYwRAIgI8UvY8mTuqt950StabgHHXVkQcDNQ1nXF+nXPZeF2MMCIA4PSvWiyqtD M5Uz/Go8xGSj/M++d04HbxFpnU53/78HAHYA7s3QZNXbGs7FXLedtM0TojKHRny8 7N7DUUhZRnEftZsAAAGFmR2YZwAABAMARzBFAiAsX3ZDLilWQyKZx5kEt2T3Z86i rVYWkmlh2HSkUO4QHwIhAMBJPChECKquNg2IRmqqFRw0NjOPlOwp+v5QiawNHGqI MCQGA1UdEQQdMBuCCXNwLm1waS5ubIIOYXJjaGl2ZS5tcGkubmwwDQYJKoZIhvcN AQEMBQADggIBAA2K4JeBaTDI/glTpTNt03QAB0xefw1JE8iUbHiGs39IeeqtgFfb W2ixUJJzXhgA+bTWwG7g4u3I1nba/3AAwpXeFyNyJXipk4GO1N7AS+WY9d+9DfcO WMF20rwXsSqAD2UpvSXs4b+pu+6+RJNTPyZBjtsu+G9SuC2CWgq/hd5+qCtE558+ xIRZqLniYi2EhtJSh5BLt6k0pDj/bQorPjdqG6HyH3gyTaNR6hG0DNPE4hGy6vda ZvYROb1jWyP+uzE8IrGOElrEBLQ74sJUHYayCe0v1MF1pW/EvJqeq/ThWfRpJ2/h wPmo0l8TlWCx6kQ+xNLsN62eoIsbSJpNZHI3aWbUPSqEEfAF6nDjoOjPGdXOUG6C uI5y360eVBfQP3PewpBwWHoffg39QPkeYAf0ODsYmV+EMiQ+/sL6SoEcAkVzgfI0 OZamXsD6yBuSzJkBJNOjZN6sPAE/cOYxt9PcgGdg0sbKbRL0jW3ZhpBvLSetm1Vg 3Z29vuIyvI1v8+iVHAhV+Atf/Gv0hmevzOMLC2rqNKaDPLqk/vkY+AV7mdtyTMOP ipXvKlE/glTqyn0dov+QDWvhKwYEICrkKVsJamUlB9OnvaQwsbvQESupSK/K9hDZ MypIN/WUMEYInqCnR9W400l6DXhV53ARZuz0MITYUpA5S0NfP0UW68Bx</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">MPI-PL Archiv</ServiceName>
-      <ServiceName xml:lang="en">MPI-PL Archive</ServiceName>
-      <ServiceDescription xml:lang="de">Forschungsdatenarchiv am Max-Planck-Institut für Psycholinguistik</ServiceDescription>
-      <ServiceDescription xml:lang="en">Research data archive at the Max Planck Institute for Psycholinguistics</ServiceDescription>
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Archive</ServiceName>
+      <ServiceDescription xml:lang="en">Research Data Archive 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="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">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 Archive</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="nl">Max Planck Instituut voor Psycholinguïstiek Archief</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik Archiv</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fi">Max Planck Instituutti Psykolingvistiikan Arkiston</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://archive.mpi.nl/</OrganizationURL>
+    <OrganizationURL xml:lang="nl">https://archive.mpi.nl/</OrganizationURL>
+    <OrganizationURL xml:lang="de">https://archive.mpi.nl/</OrganizationURL>
+    <OrganizationURL xml:lang="fi">https://archive.mpi.nl/</OrganizationURL>
   </Organization>
-  <ContactPerson contactType="administrative">
+  <ContactPerson contactType="support">
     <GivenName>Tobias</GivenName>
     <SurName>van Valkenhoef</SurName>
     <EmailAddress>mailto:shibboleth@mpi.nl</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="support">
+  <ContactPerson contactType="administrative">
     <GivenName>Tobias</GivenName>
     <SurName>van Valkenhoef</SurName>
     <EmailAddress>mailto:shibboleth@mpi.nl</EmailAddress>