--- ACOnet/https%3A%2F%2Fchildes.talkbank.org%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Fchildes.talkbank.org%2Fshibboleth.xml
@@ -1,28 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://childes.talkbank.org/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T10:06:15Z">
-      <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://clarin.eu/category/clarin-member</AttributeValue>
-      </Attribute>
-    </EntityAttributes>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <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>
+      <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
+      <AttributeValue>http://clarin.eu/category/clarin-member</AttributeValue>
+    </Attribute>
   </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">CHILDES - Child Language Data Exchange System</DisplayName>
+        <Description xml:lang="en">Transcript corpora of conversational interactions involving young children.</Description>
+        <DisplayName xml:lang="de">CHILDES - Child Language Data Exchange System</DisplayName>
+        <Description xml:lang="de">Transkribierte Korpora von Konversationen mit kleinen Kindern.</Description>
+        <DisplayName xml:lang="fi">CHILDES - Child Language Data Exchange System</DisplayName>
+        <Description xml:lang="fi">Transkriptoituja korpuksia puhekielen yhteisvaikutuksista pikkulapsille.</Description>
+        <Logo height="300" width="459">https://talkbank.talkbank.org/images/clarin500.png</Logo>
+        <Logo height="60" width="92">https://talkbank.talkbank.org/images/clarin80.png</Logo>
+        <Logo height="16" width="25">https://talkbank.talkbank.org/images/clarin16.png</Logo>
+      </UIInfo>
       <RequestInitiator xmlns="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://childes.talkbank.org/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://childes.talkbank.org/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">CHILDES - Child Language Data Exchange System</DisplayName>
-        <DisplayName xml:lang="en">CHILDES - Child Language Data Exchange System</DisplayName>
-        <Description xml:lang="de">Transkribierte Korpora von Konversationen mit kleinen Kindern.</Description>
-        <Description xml:lang="en">Transcript corpora of conversational interactions involving young children.</Description>
-        <Logo height="160" width="245">https://childes.talkbank.org/childes.gif</Logo>
-        <PrivacyStatementURL xml:lang="en">https://childes.talkbank.org/privacy</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -32,41 +47,46 @@
           <X509Certificate>MIIDAzCCAeugAwIBAgIJAJkTfjQYZ714MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV BAMTFGNoaWxkZXMudGFsa2Jhbmsub3JnMB4XDTE0MDMxODE4NTMyMloXDTI0MDMx NTE4NTMyMlowHzEdMBsGA1UEAxMUY2hpbGRlcy50YWxrYmFuay5vcmcwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5hiLowJHLHWpzZsZdAdwD9K/qwltK vnsNpsdBzFuL2hs3aeL4AQF6jka10Gb1Dgo3b5Vam5NyBau8tOb5A7GwkO6pTgnp uFaVGPJSZtmJ0pim7dB+3VtCotf+SzArzm3Uxl7LUdC8ekqMh6Tnr5g5ZsCPxl+D D24tS7B0WQTBuGAQF+9ogBxqwakSFDQPcjtt5FMf1FMyPrC9m4oezpijERxQU1qZ 2L+ZZEBO/b8h7/LYiIOdhXHmH2WvabLewtJ01rFXj8V5V65a9szEC7wh/s/mlBQ3 xchPYrScQBZdeBSBmf6FxYgvDqisxtDVO8knj5uJdhJ9qiBJYY5n3+ZzAgMBAAGj QjBAMB8GA1UdEQQYMBaCFGNoaWxkZXMudGFsa2Jhbmsub3JnMB0GA1UdDgQWBBQY 9eWGSTeFuDuIznq2Ww2d/o4KsjANBgkqhkiG9w0BAQUFAAOCAQEAHhmtwHUyGdPj eYRd5SMjgyifWAG7bQJvqiHdC1LNoTcPjTUTfzK6k01v2KDwsOSSj5tRNne3CrkV DFSQFhuUvLmUEbFTIHj0Hxkv+soOcbIlRibTW6AnEGRFE9iRFHZTAc77xij25EwB Bb7gOjZTFZMSAAmOMOkOxTW7IUI9XTjb5bseDXGr/VlkDUg3US10bhPhGFYfg9gz k7EVZj45i0IaYzsxCu6sspV3RqkZnrf7xQLFlXi2vrHDC1/tfce8iNZ39iMEi15W 6vq+/FwHiapEaha1/wqd1aPv8FLYBGdfidv6vDVZZCpvsBTjTOEs4dh70Qm/9l5C IOIhmH9kkA==</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://childes.talkbank.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://childes.talkbank.org/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://childes.talkbank.org/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://childes.talkbank.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childes.talkbank.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://childes.talkbank.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://childes.talkbank.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://childes.talkbank.org/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">CHILDES - Child Language Data Exchange System</ServiceName>
       <ServiceName xml:lang="en">CHILDES - Child Language Data Exchange System</ServiceName>
-      <ServiceDescription xml:lang="de">Transkribierte Korpora von Konversationen mit kleinen Kindern.</ServiceDescription>
       <ServiceDescription xml:lang="en">Transcript corpora of conversational interactions involving young children.</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"/>
     </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">Carnegie Mellon University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Carnegie Mellon University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cmu.edu</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Franklin</GivenName>
+    <SurName>Chen</SurName>
+    <EmailAddress>mailto:FranklinChen@cmu.edu</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Brian</GivenName>
     <SurName>MacWhinney</SurName>
     <EmailAddress>mailto:macw@cmu.edu</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Franklin</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:FranklinChen@cmu.edu</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>