3 files changed, 21 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index b1552688..1d643f3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ swamid-externals-sp-2.0.xml
 swamid-interfederations-idp-2.0.xml
 *.tbs
 *.n
+.cache
diff --git a/externals.xrd b/externals.xrd
index 9798016d..3740de30 100644
--- a/externals.xrd
+++ b/externals.xrd
@@ -7,22 +7,19 @@
            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
                 <ds:X509Data>
                     <ds:X509Certificate>
-MIIC1DCCAbygAwIBAgIETCJV1DANBgkqhkiG9w0BAQUFADAsMQ4wDAYDVQQKEwVH
-RUFOVDEaMBgGA1UEAxMRZWR1R0FJTiBTaWduZXIgQ0EwHhcNMTAwNjIzMTg0MzMy
-WhcNMTQwODAxMTg0MzMyWjAsMQ4wDAYDVQQKEwVHRUFOVDEaMBgGA1UEAxMRZWR1
-R0FJTiBTaWduZXIgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR
-fl1zhkaFveJvJtS03bRIO3k77q2s5m+c6sQ83j71rIad+vGCO29S4JHBXHI/U57y
-NbNLgoKzl0MI4WQrs4KT/y+LPMFB9M0lNrALQd/op6PNc7CWKMN1yV8V/L74/vap
-Rlb90gPVJABHmoAfQmjyMXLW38KLwzK1qEpKUIxPBfQMBawmh0gC2T5ndZndcMPp
-gsMXyG2AZ4QGSOt4tgpspjTSRY++X+gi9WUuWzsEHHdFhCR9UYQ6+1glMVheJjVm
-oD0b9V/KQ0BF/1zry2jfWlchFeILlWbWgiWsIBA4BPNHqFW42qGgUr9DI3FzRLHX
-qF2N2f592tzcTeDZ11ejAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGC8iCKBUzmN
-IhikaCImp8WIMoI9VMYf/iBGcovaujRW85BmVfE0qj2yG2BfuA8RkxX7wayvb6zn
-A7HSuQHpdVoI6poPbaW5ynZy35G3pzKs7dyZo6oGivE1Cj7PqJHXLICJin3pKWGf
-HLkkYa64B32pXy7t42Rlvn2uog5MEYCgo4jnfhxnw0iPFJTHEy3x/PJ5Yxe5o/fD
-IUXtbIb0R0Z6Tym34YsUQQvmT11vfPPsFVc6Nkda0xo2DBxaPfw3ieTojimmnToP
-LFJL9DEEWKSSrIZQYYrop0ftnQRhkFiu2TMYXiIiwKgLXKz7VybtcIMjt/tClNsD
-WTlIxwwFnNo=
+MIIC1DCCAbwCCQDDDZyGtn6K8TANBgkqhkiG9w0BAQUFADAsMQ4wDAYDVQQKEwVHRUFOVDEaMBgG
+A1UEAxMRZWR1R0FJTiBTaWduZXIgQ0EwHhcNMTQwNzAyMTQzNDQ5WhcNMTkwNzAxMTQzNDQ5WjAs
+MQ4wDAYDVQQKEwVHRUFOVDEaMBgGA1UEAxMRZWR1R0FJTiBTaWduZXIgQ0EwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCRfl1zhkaFveJvJtS03bRIO3k77q2s5m+c6sQ83j71rIad+vGC
+O29S4JHBXHI/U57yNbNLgoKzl0MI4WQrs4KT/y+LPMFB9M0lNrALQd/op6PNc7CWKMN1yV8V/L74
+/vapRlb90gPVJABHmoAfQmjyMXLW38KLwzK1qEpKUIxPBfQMBawmh0gC2T5ndZndcMPpgsMXyG2A
+Z4QGSOt4tgpspjTSRY++X+gi9WUuWzsEHHdFhCR9UYQ6+1glMVheJjVmoD0b9V/KQ0BF/1zry2jf
+WlchFeILlWbWgiWsIBA4BPNHqFW42qGgUr9DI3FzRLHXqF2N2f592tzcTeDZ11ejAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBACq0ER17moQB/39SstbsWdpGQMIsrHZ+ERF7jYdjnE/63xBfMIVFQo2G
+1PW0cZ1ckpLIQMyKyTAv9RAVxv3WVnQ9IGh715jP/QHH7ycTM7oE5XdpNzNMRDMevrtTa1T/GX6G
+6+cc73JGVoJ9JQNXbLv5bspyG9kkIu9VQqUqlrUWTjzBBysAYj4kR1gorrUmI7l2GBrrcGejQ57V
+XdUxaCKzQita0aSSzbHQ+2BxcvYV1r4QWm6Jv8HTn3c4B1d6QbaSEgGHSCkpCxwOq82gt1OM/hOz
+7wzkIQohaYEo3koNlGsat5Hc24VffcosRmNFYmGU+dCnwHDOYuxCFwLHAcg=
                     </ds:X509Certificate>
                 </ds:X509Data>
           </ds:KeyInfo>
diff --git a/mdx.fd b/mdx.fd
index 12f1edf4..ab6ddc73 100644
--- a/mdx.fd
+++ b/mdx.fd
@@ -1,13 +1,14 @@
-- when rpi:
-    - xslt:
-        stylesheet: pubinfo.xsl
-        publisher: http://www.swamid.se/
+- when swamid:
+    - reginfo:
+        authority: http://www.swamid.se/
+        policy: 
+           en: http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf
     - break
 - when update:
     - load:
-        - /opt/swamid-metadata/swamid-2.0 via rpi
+        - /opt/swamid-metadata/swamid-2.0 via swamid
         - /opt/swamid-metadata/externals.xrd
-        #- http://md.registry.swamid.se/role/sp.xml via rpi
+        #- http://md.registry.swamid.se/role/sp.xml via swamid
     - fork:
         - select as /md/swamid-2.0:
         - break