diff --git a/build/master_ukfederation.xsl b/build/master_ukfederation.xsl
index 3335b0f4..09047a99 100644
--- a/build/master_ukfederation.xsl
+++ b/build/master_ukfederation.xsl
@@ -99,6 +99,27 @@
 		</xsl:copy>
 	</xsl:template>
 	
+	<!--
+		If an IdP's SSO or AA roles already includes an Extensions element, this may
+		already contain extensions other than scopes.  We need to make sure that
+		if it does not also contain scopes, then any scopes declared at the entity
+		level are copied down.
+	-->
+	<xsl:template match="md:IDPSSODescriptor/md:Extensions |
+						 md:AttributeAuthorityDescriptor/md:Extensions">
+		<xsl:copy>
+			<xsl:apply-templates select="node()"/>
+			<xsl:if test="not(shibmeta:Scope)">
+				<!-- copy scopes from EntityDescriptor extensions -->
+				<xsl:for-each select="ancestor::md:EntityDescriptor/md:Extensions/shibmeta:Scope">
+					<xsl:text>    </xsl:text>
+					<xsl:copy-of select="."/>
+					<xsl:text>&#10;        </xsl:text>
+				</xsl:for-each>
+			</xsl:if>			
+		</xsl:copy>
+	</xsl:template>
+
 	<!--
 		Drop any explicit xsi:schemaLocation attributes from imported entity fragments.
 	-->
diff --git a/build/uk_master_back.xsl b/build/uk_master_back.xsl
index ede18e17..fa8a6a07 100644
--- a/build/uk_master_back.xsl
+++ b/build/uk_master_back.xsl
@@ -17,6 +17,7 @@
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:2.0:metadata:ui"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
@@ -27,7 +28,7 @@
 	extension-element-prefixes="date exsl mdxDates"
 	
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	exclude-result-prefixes="wayf">
+	exclude-result-prefixes="mdui wayf">
 
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
@@ -126,6 +127,13 @@
 		<!-- do nothing -->
 	</xsl:template>
 	
+	<!--
+		Strip all discovery user interface elements entirely.
+	-->
+	<xsl:template match="mdui:*">
+		<!-- do nothing -->
+	</xsl:template>
+	
 	<!--
 		Remove administrative contacts.
 	-->
diff --git a/build/uk_master_test.xsl b/build/uk_master_test.xsl
index 88097701..bd0f497b 100644
--- a/build/uk_master_test.xsl
+++ b/build/uk_master_test.xsl
@@ -18,6 +18,7 @@
 	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:2.0:metadata:ui"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/build/uk_master_unsigned.xsl b/build/uk_master_unsigned.xsl
index 866778a0..73c7694e 100644
--- a/build/uk_master_unsigned.xsl
+++ b/build/uk_master_unsigned.xsl
@@ -14,7 +14,8 @@
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:elab="http://eduserv.org.uk/labels"
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:2.0:metadata:ui"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,7 +28,7 @@
 	extension-element-prefixes="date exsl mdxDates"
 	
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	exclude-result-prefixes="md">
+	exclude-result-prefixes="md mdui">
 
 	<!--Force UTF-8 encoding for the output.-->
 	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
@@ -148,6 +149,13 @@
 		<!-- do nothing -->
 	</xsl:template>
 	
+	<!--
+		Strip all discovery user interface elements entirely.
+	-->
+	<xsl:template match="mdui:*">
+		<!-- do nothing -->
+	</xsl:template>
+	
 	<!--
 		Normalise namespace on IdP discovery elements.
 	-->