diff --git a/build/extract_addresses.xsl b/build/extract_addresses.xsl
index 535d49e9..24bcf16a 100644
--- a/build/extract_addresses.xsl
+++ b/build/extract_addresses.xsl
@@ -13,11 +13,10 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="shibmeta md ds wayf">
+	exclude-result-prefixes="md ds wayf">
 
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
diff --git a/build/extract_embedded.xsl b/build/extract_embedded.xsl
index 8e9fb77e..0c702c84 100644
--- a/build/extract_embedded.xsl
+++ b/build/extract_embedded.xsl
@@ -16,12 +16,11 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:str="http://exslt.org/strings"
-	exclude-result-prefixes="shibmeta md ds wayf str">
+	exclude-result-prefixes="md ds wayf str">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/build/extract_locs.xsl b/build/extract_locs.xsl
index e1b658df..db55917b 100644
--- a/build/extract_locs.xsl
+++ b/build/extract_locs.xsl
@@ -12,11 +12,10 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="shibmeta md ds wayf">
+	exclude-result-prefixes="md ds wayf">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/build/extract_nocert_locs.xsl b/build/extract_nocert_locs.xsl
index 8e07577f..99e5dd2c 100644
--- a/build/extract_nocert_locs.xsl
+++ b/build/extract_nocert_locs.xsl
@@ -13,11 +13,10 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	exclude-result-prefixes="shibmeta md ds wayf">
+	exclude-result-prefixes="md ds wayf">
 
 	<!-- Output is plain text -->
 	<xsl:output method="text"/>
diff --git a/build/master_to_wayf.xsl b/build/master_to_wayf.xsl
index 063fa246..8a98a35a 100644
--- a/build/master_to_wayf.xsl
+++ b/build/master_to_wayf.xsl
@@ -12,12 +12,11 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	exclude-result-prefixes="shibmeta md ds wayf">
+	exclude-result-prefixes="md ds wayf">
 
 	<!--
 		Version information for this file.  Remember to peel off the dollar signs
diff --git a/build/statistics.xsl b/build/statistics.xsl
index 11ad4cfd..442f85f3 100644
--- a/build/statistics.xsl
+++ b/build/statistics.xsl
@@ -12,7 +12,6 @@
 <xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
     xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:members="http://ukfederation.org.uk/2007/01/members"
@@ -24,7 +23,7 @@
     xmlns:dyn="http://exslt.org/dynamic"
     xmlns:set="http://exslt.org/sets"
     xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-    exclude-result-prefixes="xsl ds shibmeta md xsi members wayf ukfedlabel math date dyn set eduservlabel idpdisc"
+    exclude-result-prefixes="xsl ds md xsi members wayf ukfedlabel math date dyn set eduservlabel idpdisc"
     version="1.0">
 
     <xsl:output method="html" omit-xml-declaration="yes"/>
diff --git a/build/test_master_unsigned.xsl b/build/test_master_unsigned.xsl
index 3bf9eb45..769e13fb 100644
--- a/build/test_master_unsigned.xsl
+++ b/build/test_master_unsigned.xsl
@@ -12,7 +12,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
diff --git a/build/uk_master_back.xsl b/build/uk_master_back.xsl
index defae568..ede18e17 100644
--- a/build/uk_master_back.xsl
+++ b/build/uk_master_back.xsl
@@ -16,7 +16,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
index 322c3409..624eb7b0 100644
--- a/build/uk_master_export.xsl
+++ b/build/uk_master_export.xsl
@@ -14,7 +14,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 4120a294..75704549 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -15,7 +15,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index eb989a0f..9180c672 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -12,7 +12,6 @@
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"