--- eduGAIN/http%3A%2F%2Fwww.clarin-pl.eu%2Fshibboleth.xml
+++ CLARIN IdP/http%3A%2F%2Fwww.clarin-pl.eu%2Fshibboleth.xml
@@ -1,46 +1,71 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://www.clarin-pl.eu/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:33:40Z">
-      <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://clarin.eu/category/clarin-member</AttributeValue>
         <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>
     </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#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"/>
   </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>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">CLARIN-PL repository</DisplayName>
+        <DisplayName xml:lang="de">CLARIN-PL Repository</DisplayName>
+        <DisplayName xml:lang="fi">CLARIN-PL arkistoon</DisplayName>
+        <DisplayName xml:lang="pl">Repozytorum CLARIN-PL</DisplayName>
+        <Description xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</Description>
+        <Description xml:lang="de">CLARIN-PL digitale Langzeitarchiv - Polnisch Abschnitt CLARIN ERIC</Description>
+        <Description xml:lang="fi">CLARIN-PL digitaalinen arkistoon - Polish osa CLARIN ERIC</Description>
+        <Description xml:lang="pl">Repozytorium CLARIN-PL - Polska część infrastruktury naukowej CLARIN ERIC</Description>
+        <InformationURL xml:lang="en">http://clarin-pl.eu/en/</InformationURL>
+        <InformationURL xml:lang="pl">http://clarin-pl.eu/pl/</InformationURL>
+        <Keywords xml:lang="en">CLARIN-PL language+resources corpus linguistics repository</Keywords>
+        <PrivacyStatementURL xml:lang="en">http://clarin-pl.eu/en/privacy-policy/</PrivacyStatementURL>
+        <Logo height="32" width="32">https://clarin-pl.eu/dspace/themes/ClarinPlHomeTheme/images/favicon.ico</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://clarin-pl.eu/shibboleth/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-pl.eu/shibboleth/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">CLARIN-PL Repository</DisplayName>
-        <DisplayName xml:lang="en">CLARIN-PL repository</DisplayName>
-        <Description xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</Description>
-        <Description xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</Description>
-        <Logo height="32" width="32">https://clarin-pl.eu/dspace/themes/ClarinPlHomeTheme/images/favicon.ico</Logo>
-        <InformationURL xml:lang="en">http://clarin-pl.eu/en/</InformationURL>
-        <PrivacyStatementURL xml:lang="en">http://clarin-pl.eu/en/privacy-policy/</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>https://www.clarin-pl.eu/dspace</KeyName>
+        <KeyName>Active</KeyName>
+        <KeyName>https://www.clarin-pl.eu/shibboleth</KeyName>
+        <KeyName>www.clarin-pl.eu</KeyName>
         <X509Data>
-          <X509SubjectName>CN=https://www.clarin-pl.eu/dspace</X509SubjectName>
-          <X509Certificate>MIIDWTCCAkGgAwIBAgIJAI4ikEO5CpmIMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV BAMTH2h0dHBzOi8vd3d3LmNsYXJpbi1wbC5ldS9kc3BhY2UwHhcNMTcwMTEzMDkx MzA3WhcNMjAwMTEzMDkxMzA3WjAqMSgwJgYDVQQDEx9odHRwczovL3d3dy5jbGFy aW4tcGwuZXUvZHNwYWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA p1U2m2csfaB8Ic48iqq2PMXSkglyk6L+Wm0vf2wRDzNda3BfGBCiutJ41XGa4zQU 1H1ohFxgEQGg/O1rCKi1oQd4hvp+AkWnCGyrtjs2mMP31T3xOwZoLh7afR3DFf3v eUoFXl+d2oH3uUzYWjPBxlx6vLPc1QkKmaDYTzsjvKB38IoCVNeb0pLl+OuBOJBr 7McM5V34ewsvRdkbtYKp5IGhhRHwfrUL6T3q3N5rpy7WF59nM8CzkYMTeZZ1ewHw qysxTcbEG9T34UaOhcGrz7HHr8m9pt9MApEXepXi1EYyyBvLqzvuhw9lQYj3MGiH 7b6javsrGo9nRZpBD+XX+QIDAQABo4GBMH8wXgYDVR0RBFcwVYIfaHR0cHM6Ly93 d3cuY2xhcmluLXBsLmV1L2RzcGFjZYYyaHR0cHM6Ly9odHRwczovL3d3dy5jbGFy aW4tcGwuZXUvZHNwYWNlL3NoaWJib2xldGgwHQYDVR0OBBYEFEe6vSMjVKHRveVE wZVI5dqUW4mEMA0GCSqGSIb3DQEBBQUAA4IBAQCDiaiSRu6OXg2tBIfAXplqyApX coGLsIb1XHTinZPQItsK/+JYXggO2AWhEFi2PIMDl+RkUR6PS9zBWPcNHuNIzKVg Fh9rkvwoH8I9Gs2HbElZngdQJrfe3sos8xpruCHFa8jcrK9vWkktrTlXzmWBrerk fy+FISTJ+BkP7zmSN9z49+uEGuCot2iiudoQIqoOyyd9ziNZO2glsqSrQtQYljZI 3kRL0Meb8+yHTRkgTkWWRr9/pmTW6P20EQyNl9uZc9q8BB54itO3QWpU90KWcjB1 NTW+IX6eAxr/peOpk3HIz/osH+VeiwaBLlYUFLHOTYNQRCkwQMs3o0NevJJf</X509Certificate>
+          <X509SubjectName>CN=www.clarin-pl.eu</X509SubjectName>
+          <X509Certificate>MIIDHDCCAgSgAwIBAgIJAJY4k9BoCNIOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV BAMTEHd3dy5jbGFyaW4tcGwuZXUwHhcNMTQwMTA5MTA0ODE2WhcNMTcwMTA4MTA0 ODE2WjAbMRkwFwYDVQQDExB3d3cuY2xhcmluLXBsLmV1MIIBIjANBgkqhkiG9w0B AQEFAAOCAQ8AMIIBCgKCAQEAvBHhZZZVue2D/m6KEnfbL/wufElA6XgLs0SqfGMh VILjElWD80BG7KElkqQxrwEBf09i+z9nBbZARvVi9JnonuCa6+rHIz3e6/IoXKrA jRlUJcUJp0FKLYmG+WlTWUNO+y2OtSWWMSe7ZeHnxDkRYXwY3lLXniOClXhdplso vVc3u2BjUXPH0zCVn7ajU7IczsemoA6iy2JFKHACC4OTDxFGUPEUK0mRjyd8Ovyx Kh3QdkPrUpHZ/6aBnmiztYV1wa3mZTtk3TOrxdA+/+x4UodG6K/WSo3TIs5h9s/4 c9IZyfi/8q9V3EODO8IBTCM+zDZ8fm7g1VJ9CYFEs8et/QIDAQABo2MwYTBABgNV HREEOTA3ghB3d3cuY2xhcmluLXBsLmV1hiNodHRwczovL3d3dy5jbGFyaW4tcGwu ZXUvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUx34UwYpPZgJBTVqSl3Xfn/d+XrEwDQYJ KoZIhvcNAQEFBQADggEBAFwYzUrC7K9CpxBpnD6WjqyKiMoSR+vnoZZq3+ZUiG/O uwiTwcErddkQLonV9L2eSuY6NQn+aFebaozIS/Zj5yXjwDo8fGEKSk4tSVUc4H+f RML3XnJ25XmaSi2myy5PIh97o/NZAil8/1ArHV4PGNzMic1UNzmZymzB6AdmOrVn W3DPk2honcInege0lU7RLULmgdtMVl/QCbEWDrJ8oq0bxYwoFrVCnZXFM7SHqEba W7A4zk79hxNAxNoqlUSnX0Tk2fQQXdSTjLXEF9WLUwfW86QlQdLLkaY9hco+w8NM SvKPZd5tNDWO1hE00kzKJDPhhJZs1wFS7Tf3SJ1M1D8=</X509Certificate>
         </X509Data>
       </KeyInfo>
+      <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/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/SOAP"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/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-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
@@ -48,25 +73,30 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">CLARIN-PL Repository</ServiceName>
       <ServiceName xml:lang="en">CLARIN-PL repository</ServiceName>
-      <ServiceDescription xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</ServiceDescription>
       <ServiceDescription xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
       <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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" 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">CLARIN-PL, Wroclaw University of Technology, Poland</OrganizationName>
+    <OrganizationName xml:lang="pl">CLARIN-PL, Politechnika Wrocławska</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CLARIN-PL, Wroclaw University of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pl">CLARIN-PL</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://clarin-pl.eu/en/</OrganizationURL>
+    <OrganizationURL xml:lang="pl">http://clarin-pl.eu/pl/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Marcin</GivenName>