--- ACOnet/https%3A%2F%2Fclarin.phonetik.uni-muenchen.de.xml
+++ CLARIN IdP/https%3A%2F%2Fclarin.phonetik.uni-muenchen.de.xml
@@ -1,85 +1,90 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.phonetik.uni-muenchen.de">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-22T09:02:29Z">
-      <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://clarin.phonetik.uni-muenchen.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://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
         <DisplayName xml:lang="de">BAS Service Provider</DisplayName>
         <DisplayName xml:lang="en">BAS Service Provider</DisplayName>
+        <DisplayName xml:lang="fi">BAS Service Provider</DisplayName>
         <Description xml:lang="de">Bayerisches Archiv für Sprachsignale Service Provider (Zugriff beschränkt auf Mitglieder akademischer Einrichtungen)</Description>
         <Description xml:lang="en">Bavarian Archive for Speech Signals Service Provider (access to resources restricted to academia).</Description>
-        <InformationURL xml:lang="en">https://clarin.phonetik.uni-muenchen.de/BASRepository/</InformationURL>
-        <Logo height="156" width="396">https://www.phonetik.uni-muenchen.de/forschung/bay_arch_sprsig/bas_logo_german.jpg</Logo>
+        <Description xml:lang="fi">"Bavarian Archive for Speech Signals (BAS)":n palveluntarjoaja (vain akateemiseen käyttöön).</Description>
+        <Keywords xml:lang="en">Bavarian Archive for Speech Signals Service Provider</Keywords>
+        <Logo height="150" width="356">https://www.phonetik.uni-muenchen.de/forschung/bay_arch_sprsig/bas_logo_german.jpg</Logo>
         <PrivacyStatementURL xml:lang="en">https://www.phonetik.uni-muenchen.de/forschung/Bas/BasPolicyAAIPrivacy_eng.pdf</PrivacyStatementURL>
       </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <KeyName>Active</KeyName>
         <KeyName>clarin.phonetik.uni-muenchen.de</KeyName>
         <X509Data>
           <X509SubjectName>CN=clarin.phonetik.uni-muenchen.de</X509SubjectName>
           <X509Certificate>MIIEJDCCAoygAwIBAgIJAPCkCkgE8RJfMA0GCSqGSIb3DQEBCwUAMCoxKDAmBgNV BAMTH2NsYXJpbi5waG9uZXRpay51bmktbXVlbmNoZW4uZGUwHhcNMjExMTA5MTAx ODQzWhcNMzExMjI3MTAxODQzWjAqMSgwJgYDVQQDEx9jbGFyaW4ucGhvbmV0aWsu dW5pLW11ZW5jaGVuLmRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA w5LnbN9Kpz1nCtfczChX2KI54paXZc/F8+F2MFyP/hrTZKOdqUG9hXXH2qNAlU42 Qu2V0k4yWMO4lpr4+5s5dBTEJQ6+UvkHysMDNjdU6tQRDB9EHrFV26xXK4fHRuZd vBPS8sgfvDH+ZpU22tsEwCDwF10kQmGT7MDAGT1DWg/c54NYzKJfRIT3PS84NOaM +wslCgMrmUZtLCKvpxAgZ3BtAGnEtaVmTuo5THZYWpv8y47WCI2cfSp9YUJWT8DK J8jKourvxFpdo6dbYQi3w3iZdlmMq2skzhOZdv8ZmqymGJ2oYpGe0TPLYwoeEYFf UPDetn60dnE5tJvMZT7gUSZ1J1wmGBVZ+3pRBx+HCDz0CgviYJb9dqvIWJcM6NHU /kQ6BI6OUlIJSgnX3l+f73Z7VM5CmiSWXEFIXx4VFSrKs43J0wFQBY0oQP1klwVE xXKDQZ1JPQ4SDS1ZiLfIZzVgimKsab11YbGzyCbUPjr27ZAnEYvrmVyzhyB4T6Tz AgMBAAGjTTBLMCoGA1UdEQQjMCGCH2NsYXJpbi5waG9uZXRpay51bmktbXVlbmNo ZW4uZGUwHQYDVR0OBBYEFGBO4R/Zoa47ju/K/Z4POrI7PJt/MA0GCSqGSIb3DQEB CwUAA4IBgQCemcE1ITc1KffSDlQzpBAeoTWc0PSEaNF5OKZ2H2zwfCJQfwkHvX+d KLGlBzRSO1bRiwhGg5V9DnyuQv8gr12Fl1MQnIk23raM6JNPpW9QXN0g6dxHJZhJ nTbIXL0zubTScAdXAR0Jk8+6NdYh8EeujvuqU2HDhLm9SP2qSdD09CY3DtT4d82G ETrbYHz0eGGGvAlzrNv3XC8Wp2EROG8XRKt0uyAUgIGhYf1sNqPMafTICSJgNTR8 wPUFYANl5LO91FpGlSt2u1zIz1z3EKDNHzPspFkK1dDON5bXjsxb1Kjf3U+7xPQs M1gJAgB8NwiK4D4YgHonMZ3AGVblGhFFqO/pVOrSXd543MA8xBehq974ggpz+CM4 +SHjK4ZFlPKeZETzhXoY1hzz5H0VkIyEUe4Yx/JwRRvUh3I9veTQl6J72oqABAiA jtjyFUe1ztL/90oSyi+cGwweAeA5b+TmFddOwq0KNQx/L9s+ADlMOILbrMCG6RGQ Or80iLpo3tQ=</X509Certificate>
         </X509Data>
       </KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
-    <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.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="0"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="5"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">BAS Service Provider</ServiceName>
-      <ServiceName xml:lang="en">BAS Service Provider</ServiceName>
-      <ServiceDescription xml:lang="de">Bayerisches Archiv für Sprachsignale Service Provider (Zugriff beschränkt auf Mitglieder akademischer Einrichtungen)</ServiceDescription>
-      <ServiceDescription xml:lang="en">Bavarian Archive for Speech Signals Service Provider (access to resources restricted to academia).</ServiceDescription>
+      <ServiceName xml:lang="en">Bavarian Archive for Speech Signals Service Provider</ServiceName>
+      <ServiceDescription xml:lang="en">Bavarian Archive for Speech Signals Service Provider that allows the user to access various resources through the BASRepository that are restricted to academic use.</ServiceDescription>
+      <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="true"/>
       <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="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="entitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" 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">BAS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Bavarian Archive for Speech Signals</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.en.phonetik.uni-muenchen.de/research/bav_arch_spsig/index.html</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Klaus</GivenName>
+    <SurName>Jaensch</SurName>
+    <EmailAddress>mailto:admin@phonetik.uni-muenchen.de</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Klaus</GivenName>
     <SurName>Jaensch</SurName>
     <EmailAddress>mailto:admin@phonetik.uni-muenchen.de</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <GivenName>Raphael</GivenName>
-    <SurName>Winkelmann</SurName>
+    <GivenName>Florian</GivenName>
+    <SurName>Schiel</SurName>
     <EmailAddress>mailto:bas@bas.uni-muenchen.de</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Klaus</GivenName>
-    <SurName>Jaensch</SurName>
-    <EmailAddress>mailto:admin@phonetik.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>