--- eduGAIN/https%3A%2F%2Fsp.mpi.nl.xml
+++ CLARIN IdP/https%3A%2F%2Fsp.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://sp.mpi.nl">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2018-01-29T16:15:56Z">
-      <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 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"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">MPI für Psycholinguistik</DisplayName>
-        <DisplayName xml:lang="en">MPI for Psycholinguistics</DisplayName>
-        <Description xml:lang="de">Service Provider für Daten und Dienstleistungen am Max-Planck-Institut für Psycholinguistik</Description>
-        <Description xml:lang="en">Service Provider for Data and Services hosted at the Max Planck Institute for Psycholinguistics</Description>
-        <InformationURL xml:lang="en">http://www.mpi.nl</InformationURL>
-        <Logo height="89" width="90">https://sp.mpi.nl/gif/mpg-logo-90.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,OU=Max Planck Institute for Psycholinguistics,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</X509SubjectName>
+          <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>
+    <KeyDescriptor>
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
           <X509Certificate>MIIGIzCCBAugAwIBAgIUbvZmxtxpkZZ267J1O1hbEJnq+O4wDQYJKoZIhvcNAQEL BQAwgaAxCzAJBgNVBAYTAk5MMRMwEQYDVQQIDApHZWxkZXJsYW5kMREwDwYDVQQH DAhOaWptZWdlbjEgMB4GA1UECgwXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxMzAx BgNVBAsMKk1heCBQbGFuY2sgSW5zdGl0dXRlIGZvciBQc3ljaG9saW5ndWlzdGlj czESMBAGA1UEAwwJc3AubXBpLm5sMB4XDTI0MDEwNTA5MjY1NVoXDTI5MDEwMjA5 MjY1NVowgaAxCzAJBgNVBAYTAk5MMRMwEQYDVQQIDApHZWxkZXJsYW5kMREwDwYD VQQHDAhOaWptZWdlbjEgMB4GA1UECgwXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQx MzAxBgNVBAsMKk1heCBQbGFuY2sgSW5zdGl0dXRlIGZvciBQc3ljaG9saW5ndWlz dGljczESMBAGA1UEAwwJc3AubXBpLm5sMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A MIICCgKCAgEAuHzZw1JNqqfca9gPTDLiV8INJdxNXhulmyqo/bmV6gtc3CVLyrv6 1eGI76A0tHJ69kLhy0+TdBrkiYZ02UrbWBQjhigES2PQsSLS/hFcTfpiVSXJnLky yaV9UHpx3Dd+nQYuc2zBrqdv/OiH+P0pP8xLaHCc0EnHrRzZTVs/0kppu3pKgmZH EVAMQ1GVZ1NInepE7QmfFC7AA5Nu3xnt68I31kGXjFQeF2fxVfIrQ3uff3cGDt+U BOAzpjQjKSFLYcmDLOlpiqe4cbOLMhvA9S5oO6EetO1dRUgdEvIqn+I9DBHw/c4x PKfNX964xqVJ8k3hHYwKDYQy23u3qP6t7FBz7+YCmMRbmKJf0R4t7spRK6P5Hajd iiCMGZHhEHaiFxSqTKgHZwJPzmTaFiNGwg6zCH6mIZa9vlhFC0TLpecrBcybSPju yNHz8XtWmBcTb2L5Vg2nEU6ifmnQJKQG95XnWEvIKYn2ywc+4caTmZ2oY+M9KE+E jB6v6BFiTWInUmjlweclFF1FvXR+o9RP/T6H/RVN3kBFqFagvMbL6znDHNo447qf 5gnvCyGH1lLjE6AnJarUcPh5Psj4p0rdQHXeP1Qpi6+/8fa3ZQn4iC1y3XEuCIl8 UiPB4/zX8lRw2abkrLTXmgJ6hwhoPElIppKZMo0GZGdv8Fdqpkbvl/UCAwEAAaNT MFEwHQYDVR0OBBYEFDva/xd2Z6ti/deny5tpkJC6OhpLMB8GA1UdIwQYMBaAFDva /xd2Z6ti/deny5tpkJC6OhpLMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL BQADggIBAB3EnaAiNLCVdkJBRCO53g+XAZ1ic3oQtMIf+d0zsrkTC255muFQgVcO unWa4kQx6VhboT03+MEIuIEMg+RtWVKOckH9mL0Fz7zzcpTFH0wwRMHz5BN5cdk3 KKbxDq7I0EYrLwE9ckERsD50Y5y30l145Oe++NaokpHEVdxo0UVfq1uw/AWF7MB/ dW4IpYeu1OdU7TFtCSVrBgS4pcBw5dG0WJegWPMIPF3M//nGrZjHmOYn3CfcR5MO K19+Vil//dBrBbSpiyYWijVaJXYTTnUC1UMtX0RI4oEAaDb0+ZcTlemUiGh0bM0X 0y6Vj8KmIJ3QpBWvLPCan+n2ZAXrAPXplFOZBHyxTDJCjlqaIVvIo+8hIba40IC7 a9LAMvq8j8cIW63CfKmVzeMr1dLuTNRCcRxZ9N7clSpmsXPjFFb7XfyGT4dtSFDj DcUkrBkWIpjiRdEy025Zpfqc71kRc9/9ODCLGunyNVwhRPw6CXa9HePb4Z2YaE75 55UIg/7HNAHarlXu0YHosPTfEV3BupLIK4kT5w7ak3Z0pHvsApSPJj8twuGWlKsV 14voB4yfcL+PWVJXtSqtSQ5Vn45IgERPczGGOLdIGOcqdh54XK0jagdB6fYUg8J+ x5IIHC2XA0Y7E2Vd+1TVvq/XoOWkJ3A3tTUoT+4pUUNql/NcNYFB</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"/>
-    <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-Redirect" Location="https://sp.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <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"/>
-    <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-Redirect" Location="https://sp.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
     <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: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="de">MPI für Psycholinguistik</ServiceName>
-      <ServiceName xml:lang="en">MPI for Psycholinguistics</ServiceName>
-      <ServiceDescription xml:lang="de">Service Provider für Daten und Dienstleistungen am Max-Planck-Institut für Psycholinguistik</ServiceDescription>
-      <ServiceDescription xml:lang="en">Service Provider for Data and Services hosted at the Max Planck Institute for Psycholinguistics</ServiceDescription>
+      <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="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</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="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>