--- ACOnet/https%3A%2F%2Fsecure.huygens.knaw.nl.xml
+++ CLARIN IdP/https%3A%2F%2Fsecure.huygens.knaw.nl.xml
@@ -1,45 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.huygens.knaw.nl">
   <Extensions>
-    <RegistrationInfo xmlns="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-17T11:14:30Z">
-      <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>
     </EntityAttributes>
   </Extensions>
   <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://secure.huygens.knaw.nl/saml2/login" index="0"/>
-      <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://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
       <UIInfo xmlns="urn:oasis:names:tc:SAML:metadata:ui">
         <DisplayName xml:lang="de">Huygens ING (CLARIN-Dienste)</DisplayName>
         <DisplayName xml:lang="en">Huygens ING (CLARIN services)</DisplayName>
+        <DisplayName xml:lang="fi">Huygens ING (CLARIN palvelut)</DisplayName>
         <Description xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen der CLARIN-Initiative zur Verfügung gestellt werden.</Description>
         <Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</Description>
+        <Description xml:lang="fi">Huygens ING:n tarjoamat CLARIN-palvelut</Description>
+        <InformationURL xml:lang="nl">http://www.huygens.knaw.nl</InformationURL>
         <InformationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</InformationURL>
-        <Logo height="64" width="80">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</Logo>
+        <PrivacyStatementURL xml:lang="nl">http://www.huygens.knaw.nl/privacy-policy/</PrivacyStatementURL>
         <PrivacyStatementURL xml:lang="en">http://www.huygens.knaw.nl/privacy-policy/?lang=en</PrivacyStatementURL>
+        <Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</Logo>
+        <Logo height="64" width="96">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</Logo>
+        <Logo height="64" width="150">https://www.huygens.knaw.nl/logo/HuygensING64x150.png</Logo>
       </UIInfo>
+      <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://secure.huygens.knaw.nl/saml2/login" index="0"/>
+      <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://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
     </Extensions>
-    <KeyDescriptor use="encryption">
+    <KeyDescriptor>
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <KeyName>secure.huygens.knaw.nl</KeyName>
         <X509Data>
-          <X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</X509SubjectName>
-          <X509Certificate>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</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <KeyName>secure.huygens.knaw.nl</KeyName>
-        <X509Data>
-          <X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</X509SubjectName>
+          <X509SubjectName>CN=secure.huygens.knaw.nl,C=NL,ST=ZH,L=Den Haag,O=KNAW,OU=Huygens ING,emailAddress=sso@huygens.knaw.nl</X509SubjectName>
           <X509Certificate>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</X509Certificate>
         </X509Data>
       </KeyInfo>
@@ -47,32 +45,32 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="0"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="1"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Huygens ING (CLARIN-Dienste)</ServiceName>
       <ServiceName xml:lang="en">Huygens ING (CLARIN services)</ServiceName>
-      <ServiceDescription xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen der CLARIN-Initiative zur Verfügung gestellt werden.</ServiceDescription>
       <ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
       <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="false"/>
       <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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <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="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">Huygens Instituut (KNAW)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Huygens Instituut (KNAW)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="nl">http://www.huygens.knaw.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</OrganizationURL>
   </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Support</GivenName>
+    <SurName>Huygens ING (KNAW)</SurName>
+    <EmailAddress>mailto:sso@huygens.knaw.nl</EmailAddress>
+  </ContactPerson>
   <ContactPerson contactType="support">
     <GivenName>Support</GivenName>
     <SurName>Huygens ING (KNAW)</SurName>
     <EmailAddress>mailto:sso@huygens.knaw.nl</EmailAddress>
   </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <SurName>Huygens ING (KNAW)</SurName>
-    <EmailAddress>mailto:sso@huygens.knaw.nl</EmailAddress>
-  </ContactPerson>
 </EntityDescriptor>