Merge branch 'master' of git.swamid.se:swamid-metadata

17 files changed, 83 insertions, 7 deletions

diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index 73f6e5fe..d8261270 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -17,6 +17,7 @@
       <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://connect-beta.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">SUNET E-Meeting Service (beta)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNET Connect makes it easy and simple to organize meetings, seminars and seminars that everyone can attend - no matter where they are.</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index a0892958..4a2a7a99 100644
--- a/swamid-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
@@ -16,6 +16,7 @@
       <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://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">SUNET E-Meeting Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SUNET Connect makes it easy and simple to organize meetings, seminars and seminars that everyone can attend - no matter where they are.</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index bbd08bbc..da70a559 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -12,6 +12,7 @@
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">e-academy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">OnTheHub is your source for academic software discounts</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml b/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
index b86cd28c..0951c921 100644
--- a/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
+++ b/swamid-2.0/egiswamid.egi.kth.se-shibboleth.xml
@@ -8,6 +8,7 @@
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">e-academy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">e-academy</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -48,4 +49,10 @@ VESdo2ebFA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (Ny)</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (New)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
+  </md:Organization>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 6573955e..5908f91d 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -504,10 +504,12 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</X509Certificate>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv">Linköping University</OrganizationName>
+    <OrganizationName xml:lang="sv">Linköpings universitet</OrganizationName>
+    <OrganizationName xml:lang="en">Linköping University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.liu.se/en</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Linköping University (ADFS)</Company>
diff --git a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
index a0791cdd..4537ec7a 100644
--- a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -724,8 +724,11 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="sv">Konstfack</OrganizationName>
+    <OrganizationName xml:lang="en">Konstfack</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Konstfack</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Konstfack</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.konstfack.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.konstfack.se/en</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Håkan</GivenName>
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index ac2b9e87..ec8f9705 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -730,8 +730,11 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
+    <OrganizationName xml:lang="en">Södertörn University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Södertörns högskola</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.sh.se/</OrganizationURL>
+    <OrganizationDisplayName xml:lang="en">Södertörn University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.sh.se</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.sh.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>
diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
index 3ff4448b..6773dac4 100644
--- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
@@ -84,8 +84,10 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="sv">Ersta Sköndal Högskola</OrganizationName>
+    <OrganizationName xml:lang="en">Ersta Sköndal University College</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.esh.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.esh.se/in-english/ersta-skondal-hogskola---english.html</OrganizationURL>
   </Organization>
 </EntityDescriptor>
diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
index 5a730a89..454167f1 100644
--- a/swamid-2.0/indico.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth.xml
@@ -24,6 +24,9 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
@@ -119,4 +122,9 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     <md:SurName>Wiberg</md:SurName>
     <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index 23df7a99..0435d249 100644
--- a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -4,6 +4,7 @@
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">The KeyBucket</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The KeyBucket</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/login.fhs.se-adfs-services-trust.xml b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
index 67a1afc1..01eb693d 100644
--- a/swamid-2.0/login.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
@@ -731,9 +731,11 @@
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="sv">Försvarshögskolan</OrganizationName>
+    <OrganizationName xml:lang="en">Swedish National Defence College</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish National Defence College</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.fhs.se/en</OrganizationURL>
   </Organization>
   <ContactPerson contactType="administrative">
     <Company>Swedish Defence University</Company>
diff --git a/swamid-2.0/mp.uu.se-shibboleth.sso.xml b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
index 4147dbeb..3d2e3579 100644
--- a/swamid-2.0/mp.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
@@ -62,6 +62,12 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
       <md: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"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
   </md:ContactPerson>
diff --git a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
index 62fbfcfd..fdde5df5 100644
--- a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://swamid-idp.sys.kth.se/idp/shibboleth">
   <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
       </saml:Attribute>
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index d550a066..3e43cb62 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -24,6 +24,9 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification">
+        <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md: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">
@@ -102,4 +105,9 @@ R+DVLFswqfvJvRRyTA==
     <md:SurName>Wiberg</md:SurName>
     <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
+    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
index da9b3d8f..a704a4fd 100644
--- a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
+++ b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
@@ -22,9 +22,14 @@
     <md:Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify-l.myunidays.com/Shibboleth.sso/Login"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNiDAYS </mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIDAYS provides students and educators with secure and exclusive access to discounts, educational pricing and content.</mdui:Description>
-        <mdui:Logo height="100" width="300">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_300x100px.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">UNiDAYS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">UNiDAYS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNiDAYS is the world’s leading Student Affinity Network, connecting a global student audience with relevant brands and services.</mdui:Description>
+        <mdui:Description xml:lang="sv">UNiDAYS är världens ledande studentnätverk som kopplar ihop studenter i hela världen med relevanta märken och tjänster.</mdui:Description>
+        <mdui:Logo xml:lang="sv" height="100" width="300">https://images1.unidays.world/wayf/logo_300x100.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="100" width="300">https://images1.unidays.world/wayf/logo_300x100.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.myunidays.com/SE/sv-SE/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.myunidays.com/GB/en-GB/privacy-policy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -158,6 +163,17 @@ ddwo4rjzX4vHWLDfHWzCIvAiMweOvpmUoB2sn01rdxezW7/zuNuEdA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify-l.myunidays.com/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify-l.myunidays.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify-l.myunidays.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UNiDAYS</md:ServiceName>
+      <md:ServiceName xml:lang="sv">UNiDAYS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">UNiDAYS is the world’s leading Student Affinity Network, connecting a global student audience with relevant brands and services.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">UNiDAYS är världens ledande studentnätverk som kopplar ihop studenter i hela världen med relevanta märken och tjänster.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md: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"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md: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"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="administrative">
     <md:Company>UNiDAYS</md:Company>
diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml
index 19658d9d..f00b1ac6 100644
--- a/swamid-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml
@@ -23,6 +23,7 @@
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webinar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">NORDUnet Webinar Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NORDUnet Webinar Service</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index 51bdba8b..5d337d8b 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -51,6 +51,17 @@ fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
 urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
 </md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.10"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>