--- eduGAIN/https%3A%2F%2Frepository.clarin.is%2Fshibboleth.xml
+++ CLARIN IdP/https%3A%2F%2Frepository.clarin.is%2Fshibboleth.xml
@@ -1,70 +1,104 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repository.clarin.is/shibboleth">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2020-02-03T08:28:12Z">
-      <RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/fileadmin/documents/mrps_dfn-aai_1.0.pdf</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>
     </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"/>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
+      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
+        <DisplayName xml:lang="en">CLARIN-IS Repository</DisplayName>
+        <DisplayName xml:lang="is">CLARIN-IS Gagnagrunnur</DisplayName>
+        <Description xml:lang="en">Digital repository and services of the CLARIN Centre at the Arni Magnusson Institute.</Description>
+        <Description xml:lang="is">Rafræn skráning gagna og Clarin þjónusta við Stofnun Árna Magnússonar</Description>
+        <InformationURL xml:lang="en">https://clarin.is/en/about/</InformationURL>
+        <InformationURL xml:lang="is">https://clarin.is/um-clarin/</InformationURL>
+        <Logo height="209" width="300">https://repository.clarin.is/repository/xmlui/themes/UFAL/images/clarin-logo-is.png</Logo>
+        <Keywords xml:lang="en">CLARIN DSpace</Keywords>
+        <PrivacyStatementURL xml:lang="en">https://repository.clarin.is/repository/xmlui/page/privacypolicy</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://repository.clarin.is/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://repository.clarin.is/Shibboleth.sso/Login" index="1"/>
-      <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
-        <DisplayName xml:lang="de">CLARIN-IS Repository</DisplayName>
-        <DisplayName xml:lang="en">CLARIN-IS Repository</DisplayName>
-        <Description xml:lang="de">Digital repository and services of the CLARIN Centre at the Arni Magnusson Institute.</Description>
-        <Description xml:lang="en">Digital repository and services of the CLARIN Centre at the Arni Magnusson Institute.</Description>
-        <InformationURL xml:lang="en">https://clarin.is/en/about/</InformationURL>
-        <Logo height="209" width="300">https://repository.clarin.is/repository/xmlui/themes/UFAL/images/clarin-logo-is.png</Logo>
-        <PrivacyStatementURL xml:lang="en">https://repository.clarin.is/repository/xmlui/page/privacypolicy</PrivacyStatementURL>
-      </UIInfo>
     </Extensions>
     <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>repository-sp.clarin.is</KeyName>
+        <KeyName>repository.clarin.is</KeyName>
         <X509Data>
-          <X509SubjectName>CN=repository-sp.clarin.is</X509SubjectName>
+          <X509SubjectName>CN=repository.clarin.is</X509SubjectName>
           <X509Certificate>MIIDJTCCAg2gAwIBAgIUeZOL1vyPAI8Qf/HL1JN7TL65mFQwDQYJKoZIhvcNAQEL BQAwIjEgMB4GA1UEAwwXcmVwb3NpdG9yeS1zcC5jbGFyaW4uaXMwHhcNMTkwOTEw MTUxNzA5WhcNMjkwOTA3MTUxNzA5WjAiMSAwHgYDVQQDDBdyZXBvc2l0b3J5LXNw LmNsYXJpbi5pczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL49lNvk 7zV8vK48NAnzI57NzDEeTTbt3V9rcpKv6BDXBk4R7nlLWNoYygMvLv/Y1qFeqx3f kJWOqz75NxoMo46o0vTTHpqjYKGakMGF1IOAv94qbsoAuakpd/8B+D7N4cAGYipZ uubde3tAwHMU3MjIWgWobALeq/KuieV3OrFVvjxPwDE5Rueik4hkaTtlRiFDC1E5 dC9sfogeq0uOKKbS9RhhF8gjmEc/aSkN243HHnewYBMz61FGZ8UtXTZRNuk9ntJt 58uRp8yoL0UvK7vShRrdfXzVjAx75fTsae8NQuZcGCdbFerzdrvSVwFdElvsmQib 0Pjwe+dAYoCUzTECAwEAAaNTMFEwHQYDVR0OBBYEFK8E04DnMtMVparyquS+wX45 aAtrMB8GA1UdIwQYMBaAFK8E04DnMtMVparyquS+wX45aAtrMA8GA1UdEwEB/wQF MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHUTQK6fzobBs48HA4Lk3AZgSA22GlIg NuK2HqqDiR4mVuB2sh/XRQN5lBhpjPqTO9Ho716D+qqQbtsYnBbR3qvgzTcHriAF A6Ul4YYjv4b78IDSp4xjRbAmGo6qGTjH1yGBcpKPcJs5OaWjeWAK/Llk8SyA1teo OH03+VAGHmqMl09br1t/AHG/YD0gYcmZBtRLV94pEGY/o830QoWz/R2wwuCAchoQ CaGfvZLFDgNz4/P6OAOEZzWZnOsMQ9lADf1iRBq3/jMaJeLQHmhK6mtd8EU04hQY b7H/6vVt047Fs9QuwAr0aAUy+kJ7mK3pu9Ktjx7+4MUDNIV89EfhJek=</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://repository.clarin.is/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.clarin.is/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.clarin.is/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.clarin.is/Shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.clarin.is/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.clarin.is/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.clarin.is/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.clarin.is/Shibboleth.sso/SLO/SOAP"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.clarin.is/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.clarin.is/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.clarin.is/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.clarin.is/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">CLARIN-IS Repository</ServiceName>
       <ServiceName xml:lang="en">CLARIN-IS Repository</ServiceName>
-      <ServiceDescription xml:lang="de">Digital repository and services of the CLARIN Centre at the Arni Magnusson Institute.</ServiceDescription>
+      <ServiceName xml:lang="is">CLARIN-IS Rafræn skráning gagna</ServiceName>
       <ServiceDescription xml:lang="en">Digital repository and services of the CLARIN Centre at the Arni Magnusson Institute.</ServiceDescription>
+      <ServiceDescription xml:lang="is">Rafræn skráning gagna og þjónusta við Clarin hjá Stofnun Árna Magnússonar</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="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"/>
-      <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: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"/>
-      <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"/>
     </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">Arni Magnusson Institute for Iclandic Studies</OrganizationName>
+    <OrganizationName xml:lang="is">Stofnun Árna Magnússonar í íslenskum fræðum</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Arni Magnusson Institute for Icelandic Studies</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="is">Stofnun Árna Magnússonar</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.arnastofnun.is/en/front-page</OrganizationURL>
+    <OrganizationURL xml:lang="is">https://www.arnastofnun.is/is/forsida</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <GivenName>CLARIN-IS</GivenName>