--- eduGAIN/https%3A%2F%2Fclarin.ids-mannheim.de%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fclarin.ids-mannheim.de%2Fshibboleth.xml
@@ -1,25 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-24T13:14:25Z">
-      <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>
       <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>
-      <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:1.1:protocol urn:oasis:names:tc:SAML:2.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://clarin.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
@@ -28,7 +18,7 @@
         <Description xml:lang="de">Verschiedene Dienste des Leibniz-Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</Description>
         <Description xml:lang="en">Various services provided by the Leibniz-Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</Description>
         <Logo height="16" width="16">https://clarin.ids-mannheim.de/logos/ids-logo-small.png</Logo>
-        <Logo height="76" width="240">https://clarin.ids-mannheim.de/logos/ids-logo-large.png</Logo>
+        <Logo height="63" width="318">https://clarin.ids-mannheim.de/logos/ids-logo-large.png</Logo>
         <InformationURL xml:lang="de">http://www.ids-mannheim.de</InformationURL>
         <InformationURL xml:lang="en">http://www.ids-mannheim.de</InformationURL>
         <PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</PrivacyStatementURL>
@@ -38,8 +28,8 @@
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <KeyName>clarin.ids-mannheim.de</KeyName>
         <X509Data>
-          <X509SubjectName>CN=clarin.ids-mannheim.de,O=Leibniz-Institut fuer Deutsche Sprache (IDS),L=Mannheim,ST=Baden-Wuerttemberg,C=DE</X509SubjectName>
-          <X509Certificate>MIIIDjCCBvagAwIBAgIMJP5LNtD8shxGtmh5MA0GCSqGSIb3DQEBCwUAMIGNMQsw CQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVz IERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4t UEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTIx MDcwMjA4MjYyMVoXDTIyMDgwMjA4MjYyMVowgZUxCzAJBgNVBAYTAkRFMRswGQYD VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxETAPBgNVBAcMCE1hbm5oZWltMTUwMwYD VQQKDCxMZWlibml6LUluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZSAoSURT KTEfMB0GA1UEAwwWY2xhcmluLmlkcy1tYW5uaGVpbS5kZTCCASIwDQYJKoZIhvcN AQEBBQADggEPADCCAQoCggEBAMKWhU6DuiI+ELQNNYdtaaWII/rZocTSUMmqdDsv NO0tX7IsCafGeohf5U3Xv5DdUBKg77XR+Hmzp0M3Jj4zjbPiEOgsRnhofw9SxLgs omZiJNVcVAkWPvoNJoUT6ipxQwXrQ7OfMmOXrJeXJO8kAJyQN3cJ76jhqF/D5hL/ a7W/mmuAfpkg94XbgFLFT2cIPnMsSto1xFyXTm/HMfxOPwtNkiDN5oJlGreakA+2 sL00blIZZRRfKODRsK188ogA3p4qQxPn8bBYooHwvPXQjhWbp3euMRLXBdSe9Wi9 uWcbLEIWbeHns5VlTGeCMvL5oA8WTUs7qc8Y7CGlB1bB4z0CAwEAAaOCBGIwggRe MFcGA1UdIARQME4wCAYGZ4EMAQICMA0GCysGAQQBga0hgiweMA8GDSsGAQQBga0h giwBAQQwEAYOKwYBBAGBrSGCLAEBBAkwEAYOKwYBBAGBrSGCLAIBBAkwCQYDVR0T BAIwADAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF BwMBMB0GA1UdDgQWBBQxtxMByFCYGXoMBG+kpjGEtn4LpTAfBgNVHSMEGDAWgBRr OpiL+fJTidrgrbIyHgkf6Ko7dDAhBgNVHREEGjAYghZjbGFyaW4uaWRzLW1hbm5o ZWltLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4u ZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDA/oD2gO4Y5aHR0 cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2Fj cmwuY3JsMIHbBggrBgEFBQcBAQSBzjCByzAzBggrBgEFBQcwAYYnaHR0cDovL29j c3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEkGCCsGAQUFBzAChj1odHRw Oi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NhY2VydC9j YWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rm bi1jYS1nbG9iYWwtZzIvcHViL2NhY2VydC9jYWNlcnQuY3J0MIIB9gYKKwYBBAHW eQIEAgSCAeYEggHiAeAAdQBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8cP5t RwAAAXpmU3LYAAAEAwBGMEQCIDQLWH6tAA7uVeTMnVzaFugqpqr3zuSC+D8v46WZ MNDzAiA4EHWfL+xScAb+wSfu0lEA9K/00rIYvndkS+OUQ6jYFQB3ACl5vvCeOTkh 8FZzn2Old+W+V32cYAr4+U1dJlwlXceEAAABemZTeHkAAAQDAEgwRgIhAMJVKdiV FA6tvSTVDepy9Jaxf4IlSzV3jRrK+C3HaVw4AiEAiLQKDQkjmHH7rMwFO/Mu7wT3 I/pVCzqIB+3AK/eSExsAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZ EwAAAXpmU3LtAAAEAwBHMEUCIFrU2NcCRdLakauD6B2jgTk2vuzbCJELcaQAIgO4 sB0gAiEAwpML/wKjhE8/IW9WIyOkuqPlugUOKxfYSCd+mmcpkN0AdgBVgdTCFpA2 AUrqC5tXPFPwwOQ4eHAlCBcvo6odBxPTDAAAAXpmU3P+AAAEAwBHMEUCIFBmf7JP 0zSdbHTBIpQWPMuM5/7qfQe9ys1d05u8CTsvAiEAw4/w+ph0dZDkW7cS/uPuIn8m PPoxvh871R++kg9mN/UwDQYJKoZIhvcNAQELBQADggEBAGUZOeZwn/WugE+o4hFG 8E66iDyTizmZWrZIfhe8pELdWL1aozcvriFjDn0+LxGzFpliIvbAmXoWfw1ZWpsP kZ1Fx+79BQE/eyOseLIbO+3IPaaG5UeHIQ0gzHd3RHcTcZty2r446l1ygAjfKwcs ARygJREpAP440KRBwbsEz4YG+1oqy4c7xDHqeHCKNvs24NFlaY/cS8cW5igHdkhI kSFkEMUTmVMNH8O4tU+xWNjQTGXlgQfhacEquds3PnKwNNirdpW8McNB/Hs4uL5D CD4u6jCBoaMiVQamcusdyUoWnIq90azKs9fUJq1kTtBqoe0SB9Yc+Ygao36qzebD krg=</X509Certificate>
+          <X509SubjectName>CN=clarin.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</X509SubjectName>
+          <X509Certificate>MIIJaDCCCFCgAwIBAgIMIOY+1HrEp6W1D+cbMA0GCSqGSIb3DQEBCwUAMIGNMQsw CQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVz IERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4t UEtJMSUwIwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTE5 MDQyOTA5MTgxMloXDTIxMDczMTA5MTgxMlowgYcxCzAJBgNVBAYTAkRFMRswGQYD VQQIDBJCYWRlbi1XdWVydHRlbWJlcmcxETAPBgNVBAcMCE1hbm5oZWltMScwJQYD VQQKDB5JbnN0aXR1dCBmdWVyIERldXRzY2hlIFNwcmFjaGUxHzAdBgNVBAMMFmNs YXJpbi5pZHMtbWFubmhlaW0uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK AoIBAQCot+lnPlnoMVELBOm7ZZePkd1idDs4cIciA21OlOpp6BSGFxEVJaJXN1fy zMPKNFaLIqfycCtPEonLSVrbJky/MGjNPOATz56gPPRNBc4AJETffLkxR5uQqDxI AW/VWPOvmgXM+g3VJO/marZmj2tNbuYncdho4GfHiz/g6N30/90XkS4+BUCc8KH7 mOhOcLs8zXOHCwxJ6jUp08FLIIlldAo7a9sfw+gt2jiDKVxC/ITj7r6bFGhw26le +6tozFkuaiO8EsZllyOpuBWBQk8K3v77p3PdT9/gm8+tGSOZW7HkJ5pzNLyqPy8u fxASqLE4S3Sy2vMl63Lm47dtGZDHAgMBAAGjggXKMIIFxjBZBgNVHSAEUjBQMAgG BmeBDAECAjANBgsrBgEEAYGtIYIsHjAPBg0rBgEEAYGtIYIsAQEEMBEGDysGAQQB ga0hgiwBAQQDCTARBg8rBgEEAYGtIYIsAgEEAwkwCQYDVR0TBAIwADAOBgNVHQ8B Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW BBQlpwIMDCd4nXTYO4wXXQJZ4O3n2jAfBgNVHSMEGDAWgBRrOpiL+fJTidrgrbIy Hgkf6Ko7dDAhBgNVHREEGjAYghZjbGFyaW4uaWRzLW1hbm5oZWltLmRlMIGNBgNV HR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNhLWds b2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNh LmRmbi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jcmwvY2FjcmwuY3JsMIHbBggr BgEFBQcBAQSBzjCByzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k ZS9PQ1NQLVNlcnZlci9PQ1NQMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2Eu ZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkG CCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jYS1nbG9iYWwt ZzIvcHViL2NhY2VydC9jYWNlcnQuY3J0MIIDXAYKKwYBBAHWeQIEAgSCA0wEggNI A0YAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZEwAAAWpoY1O5AAAE AwBHMEUCIQDrewLpYf04ZQkh677E6sPexzf3lAjdfozk66KTVYzLmAIgZLtAsPU/ P2O7GwrMkt4tm5gsoRCCVElb7Vm9OzAw+7MAdwCq5wt/PLjVZshsLxaXnJ9EX2mr DrRTVYmy93oDAQTzzQAAAWpoY1PdAAAEAwBIMEYCIQCS0vthsPi6C8kQHLVsrQaq ZsTAc+5YCpT98yMRoqfjagIhALodVUa0Q9SFeMPQByDhGgl5u+zR/J7sVx5g8VRQ LCCdAHYAVYHUwhaQNgFK6gubVzxT8MDkOHhwJQgXL6OqHQcT0wwAAAFqaGNUygAA BAMARzBFAiEAn/cwzZjVSZ+xf2ix2qmh8PtQCViQzNXkEDKysHzcBT0CIGkiVWY1 YvpZYnOWEfLu+rfX8Rr0jvjd3Y6qDgOk3aOwAHUA7ku9t3XOYLrhQmkfq+GeZqMP fl+wctiDAMR7iXqo/csAAAFqaGNUKgAABAMARjBEAiBGTJspMjdF3vM6GXnPn8Sh TyJSAcwLC+aadftTI4TuYAIgfslq5A2pI9T0s5VduFvcquQqCHkUGPWwDkGqLZR2 65kAdQC72d+8H4pxtZOUI5eqkntHOFeVCqtS6BqQlmQ2jh7RhQAAAWpoY1QZAAAE AwBGMEQCICOOpz3062b/W72CaRxH0BvskOuOChndtZp4bJTngge8AiBHi/10pBLV IfAAp9LKrGizova5Eag3hAnMqfSU2eIFIAB2AESUZS6w7s6vxEAH2Kj+KMDa5oK+ 2MsxtT/TM5a1toGoAAABamhjWOAAAAQDAEcwRQIhANDxR6MfP2sfj0TYjMw4T/yW wW9ibx9KA26OmY38XJQBAiAmrXE1of8EP2RdoCzNCJXZ4CNQgC99wyumFdYpbm1A EQB1AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABamhjVGgAAAQD AEYwRAIgSQtxo6PGpkKgPfCrC1LFVKh/I8NCNVXnxSnekCqmIWICIC/z8oWRJmcM yReCVTxfBrgDZK+UqRbPEFpXVJySakkHMA0GCSqGSIb3DQEBCwUAA4IBAQB5UQEm blXMuw+BHGl/r9HWFehPzRwpAZe2rH6LBw31my+YWWFIhgT5IZ0GYC0BOEvu4sIN sEFEnvEVx71/KdKSA1FWMEJ0jAKCtIboHAC8g0F712X+fUSYP6V8N4mGkY8FZNM7 ibeOiJgxxjqX2D9g29om0tk6SJWNfHH1+e4xxDvARkSswP0bO1TYcIW5Xvwp64gM nHahJQ0yNyzHKn4E31Xx4yk2IujWGKZiQfZ7L6L+Ck5+N47dwUw+n9X44JAeGiSM l7qGTir4eDVJmMYnY4RC+1C2OZqcyLjNjEHNmxa9ewE64H1Ej1Bxhq+xH9iYcp5L ClHluYE68RvC6Guc</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -47,11 +37,14 @@
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
     <AttributeConsumingService index="1">
       <ServiceName xml:lang="de">CLARIN Dienste</ServiceName>
       <ServiceName xml:lang="en">CLARIN services</ServiceName>
@@ -71,18 +64,18 @@
     <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>AAI</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
+    <GivenName>Oliver</GivenName>
+    <SurName>Schonefeld</SurName>
+    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="administrative">
-    <GivenName>AAI</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
+    <GivenName>Andreas</GivenName>
+    <SurName>Witt</SurName>
+    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>AAI</GivenName>
-    <SurName>Support</SurName>
+    <SurName>Team</SurName>
     <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
   </ContactPerson>
   <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">