--- eduID.cz/https%3A%2F%2Fwebanno.sfs.uni-tuebingen.de.xml
+++ CLARIN IdP/https%3A%2F%2Fwebanno.sfs.uni-tuebingen.de.xml
@@ -1,30 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webanno.sfs.uni-tuebingen.de">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-03-22T22:32:44Z">
-      <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="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>
-        <AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</AttributeValue>
-        <AttributeValue>http://refeds.org/category/research-and-scholarship</AttributeValue>
       </Attribute>
     </EntityAttributes>
   </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol 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>
       <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://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">CLARIN WebAnno</DisplayName>
         <DisplayName xml:lang="de">CLARIN WebAnno</DisplayName>
-        <DisplayName xml:lang="en">CLARIN WebAnno</DisplayName>
+        <DisplayName xml:lang="fi">CLARIN WebAnno</DisplayName>
+        <Description xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</Description>
         <Description xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</Description>
-        <Description xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</Description>
+        <Description xml:lang="fi">WebAnno on yleiskäyttöinen web-pohjainen kielellinen käsinkirjoitustyökalun.</Description>
         <Logo height="128" width="128">https://webanno.github.io/webanno/assets/img/logo.png</Logo>
         <InformationURL xml:lang="en">http://webanno.sfs.uni-tuebingen.de/</InformationURL>
-        <PrivacyStatementURL xml:lang="en">https://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</PrivacyStatementURL>
+        <PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</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://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/Login"/>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -35,32 +38,34 @@
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SLO/POST"/>
-    <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://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webanno.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">CLARIN WebAnno</ServiceName>
-      <ServiceName xml:lang="en">CLARIN WebAnno</ServiceName>
-      <ServiceDescription xml:lang="de">WebAnno ist ein webbasiertes Allzweck-Werkzeug für linguistische Anmerkungen.</ServiceDescription>
-      <ServiceDescription xml:lang="en">WebAnno is a general purpose web-based linguistic annotation tool.</ServiceDescription>
+      <ServiceName xml:lang="en">WebAnno instance at University of Tübingen</ServiceName>
+      <ServiceDescription xml:lang="en">WebAnno instance at University of Tübingen</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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+    <AttributeConsumingService index="6">
+      <ServiceName xml:lang="en">WebAnno instance at University of Tübingen</ServiceName>
+      <ServiceDescription xml:lang="en">WebAnno instance at University of Tübingen</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="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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">SfS, University of Tübingen</OrganizationName>
+    <OrganizationName xml:lang="de">SfS, Universität Tübingen</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SfS, University of Tübingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="de">SfS, Universität Tübingen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.sfs.uni-tuebingen.de/en/</OrganizationURL>
+    <OrganizationURL xml:lang="de">http://www.sfs.uni-tuebingen.de/de/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Marie</GivenName>