--- DFN-AAI/https%3A%2F%2Fshibboleth.bbaw.de%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fshibboleth.bbaw.de%2Fshibboleth.xml
@@ -1,22 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bbaw.de/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-03-13T16:23:00Z">
-      <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>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.bbaw.de/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://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
@@ -25,69 +22,66 @@
         <DisplayName xml:lang="en">BBAW - CLARIN services</DisplayName>
         <Description xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW)</Description>
         <Description xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW)</Description>
+        <Keywords xml:lang="en">BBAW Linguistic Services</Keywords>
+        <Keywords xml:lang="nl">BBAW Linguistische Dienste</Keywords>
+        <Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</Logo>
         <InformationURL xml:lang="de">http://www.bbaw.de</InformationURL>
-        <Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</Logo>
         <InformationURL xml:lang="en">http://www.bbaw.de</InformationURL>
-        <PrivacyStatementURL xml:lang="en">https://shibboleth.bbaw.de/index.html</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>shibboleth.bbaw.de</KeyName>
+        <KeyName>Active</KeyName>
         <X509Data>
-          <X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,ST=Berlin,C=DE</X509SubjectName>
           <X509Certificate>MIIIbjCCBlagAwIBAgIRAOj1Qa8O7IkTOVA/rfR7x0QwDQYJKoZIhvcNAQEMBQAw RDELMAkGA1UEBhMCTkwxGTAXBgNVBAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNV BAMTEUdFQU5UIE9WIFJTQSBDQSA0MB4XDTIzMDkwNjAwMDAwMFoXDTI0MDkwNTIz NTk1OVoweTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjE8MDoGA1UEChMz QmVybGluLUJyYW5kZW5idXJnaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNjaGFm dGVuMRswGQYDVQQDExJzaGliYm9sZXRoLmJiYXcuZGUwggIiMA0GCSqGSIb3DQEB AQUAA4ICDwAwggIKAoICAQDTk3rc0mbvglNJivGtI3w/LgKmsB3He2cvr6M/VF5h VAbwrs9KC1KK59CqB7G89DrRDhkM1oafISFmpMC0cXWucMHDB7ydO4LqkBfhIZts BoAmg2+/Ej3SMPhZV812FXunRxRl0z1B08ll+S7C/MmdBkA2eZ7wllv5VH4bfxrN dGnhkb4iva4em6Y2fjPgSEqGTu9+HurHLlTx/OGsUnwkhSv6aYiydru1eWs1zcwj /YN8FwjWUs4KdWhTjFgOv271Ec4+9y/2bwKntfGEO8Hb7nmh+gnMWgz1j1wK4YxH XhownTUGz7asuSMcIKNqBWDGQ9mcS8kiMwibYmudFS+q67ZO+ulcf6Ev5IDVOZYD KgEEg98z5VNBJqgrK4lxvlrFqCfmhetGDWqZ91L0fB6qAi4/gpd1WJpgAE7Nclfn ALTj6jpCqP/ZZr0Jvr3fTgamtQ5qBjXYhxUkX5uDbpLB5pokkFpJEh2Y+TrTrKpY LI76KOdxidT0AmopyufgCjS541hgIOGJrS8p4oLrmbXB04GzhzPPwn0RxFBMXggD BBdglEhWJBk8AAICrFPcge804AyeRQBp5vjVAr2cTM1jdVf/hkwgYVHDByI8JrEe Z6Y0yoH3qWbDAQU3tLItXOx0Av//FOIJJdJox+V9zeklZrHuFDpSqVXKqnwXijyU xQIDAQABo4IDJDCCAyAwHwYDVR0jBBgwFoAUbx01SRBsMvpZoJ68iugflb5xegww HQYDVR0OBBYEFHZN8EzVgdgpD0WY3R4QLsUHsu/HMA4GA1UdDwEB/wQEAwIFoDAM BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBJBgNV HSAEQjBAMDQGCysGAQQBsjEBAgJPMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8vc2Vj dGlnby5jb20vQ1BTMAgGBmeBDAECAjA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8v R0VBTlQuY3JsLnNlY3RpZ28uY29tL0dFQU5UT1ZSU0FDQTQuY3JsMHUGCCsGAQUF BwEBBGkwZzA6BggrBgEFBQcwAoYuaHR0cDovL0dFQU5ULmNydC5zZWN0aWdvLmNv bS9HRUFOVE9WUlNBQ0E0LmNydDApBggrBgEFBQcwAYYdaHR0cDovL0dFQU5ULm9j c3Auc2VjdGlnby5jb20wggF9BgorBgEEAdZ5AgQCBIIBbQSCAWkBZwB1AHb/iD8K tvuVUcJhzPWHujS0pM27KdxoQgqf5mdMWjp0AAABimk3+YMAAAQDAEYwRAIgQCDm E4LnvoYhYNhKE2fxOYRJ9NR6xdmcImLOCw2k3XMCIHGbSB4aZ6CAnHVf8bnSAto2 sMISrgbrbJoh68V2JieoAHUA2ra/az+1tiKfm8K7XGvocJFxbLtRhIU0vaQ9MEjX +6sAAAGKaTf53QAABAMARjBEAiA90D/2S/woJdxte5Z/Vx22bBXn9TTyCJMWEVej seDM6gIgF8V1OaYqQBa7yyFwzV3GkGZMaWU6lU11Ee7I2GSH4KEAdwDuzdBk1dsa zsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYppN/mrAAAEAwBIMEYCIQCf/9Vj Tw/6oy4qjA49JeMuS/417Q6R7Fc+Uu6JY1pm6QIhAOwwswvo1J05VMgpwRjLAdkm dV1ZOLTylQdM2v8w9t9aMB0GA1UdEQQWMBSCEnNoaWJib2xldGguYmJhdy5kZTAN BgkqhkiG9w0BAQwFAAOCAgEAkO9dev1wv9++n9mmskd5e7hgtF4k/FmJGNY7SeVd k7U5IYL3070RerJLIU2Yd+JILRAfdpHHZOQyZ0Y1cgVjL1/x2GgarUp+io9OF8nu 516aLJPxqQIhg2Y9jm70Zmu/E/BlML4LAXLIGd+CpRj5UyLaMlypakSdNzB44zeM 9eRQvdkHxckKHyThUZRCeRi1ti+FnZ03i2+j5dtCZicQWo6/ACtSa10GC8VGrWO5 NEReSCyTtqjgvTkYxlySawWa9/rd0o+0tymLVTrzySnIRe2c+nsk+mRtTdunrv1Z rB0b5FvDv5P9hdq4WKy60JDXm6rgQoAtUG5/9ld82+eiLodSdbr8Ffgxgv9yY2V9 zTqcYVGqngK3LT/J1VyhFwQJgcXx81/Fx5M4IHhImqa5iqUP2UX03VKpDRBbPmS+ P2e/CU9b0CCRHsN7vjzkEBYUzkDVkDEmv6XQ8oBZSUqzs9LCJCA0JG/FQMXKAAu+ egSD3fZgsSKOG3jjxNAJWDaHYIfnPESIaazTkdFFhEGu4TRAzHuuBMlnUmaXZxnN q4y9/3slBr6tnohE7nBoeAZub+L786LTL1H5NBkL6SdpZxPod/+/QVic02p8SGeE W8aDLLMCwxQ3fZckLeX6wfZHIBsk5Nl53+aq6BjdyTACDrU+KylKVuR+lnWrnc7v bB0=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">BBAW - CLARIN services</ServiceName>
       <ServiceName xml:lang="de">BBAW - CLARIN-Dienste</ServiceName>
-      <ServiceName xml:lang="en">BBAW - CLARIN services</ServiceName>
-      <ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW)</ServiceDescription>
-      <ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW)</ServiceDescription>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</ServiceDescription>
+      <ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="de">e209</OrganizationName>
-    <OrganizationName xml:lang="en">e209</OrganizationName>
+    <OrganizationName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationName>
+    <OrganizationName xml:lang="en">Berlin-Brandenburg Academy of Sciences and Humanities</OrganizationName>
     <OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Berlin-Brandenburg Academy of Sciences and Humanities</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.bbaw.de</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.bbaw.de</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Kai</GivenName>
+    <SurName>Zimmer</SurName>
+    <EmailAddress>mailto:zimmer@bbaw.de</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Dr. Jörg</GivenName>
     <SurName>Brauns</SurName>
     <EmailAddress>mailto:direktor@bbaw.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>Kai</GivenName>
-    <SurName>Zimmer</SurName>
-    <EmailAddress>mailto:security@bbaw.de</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Kai</GivenName>
     <SurName>Zimmer</SurName>
     <EmailAddress>mailto:zimmer@bbaw.de</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kai</GivenName>
-    <SurName>Zimmer</SurName>
-    <EmailAddress>mailto:zimmer@bbaw.de</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>