diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 06e2d1a7..1bbf5e67 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -354,6 +354,21 @@
     </bean>
     
     
+    <!--
+        uk_removeGatewayKeyName
+        
+        Remove the Athens gateway's KeyName wherever it appears.
+    -->
+    <bean id="uk_removeGatewayKeyName" parent="XSLTransformationStage"
+        p:id="uk_removeGatewayKeyName">
+        <property name="XSLResource">
+            <bean parent="ClasspathResource">
+                <constructor-arg value="uk/remove_gw_keyname.xsl"/>
+            </bean>
+        </property>
+    </bean>
+    
+    
     <!--
         uk_stripAdminContacts
         
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 2d17ab59..d3971e42 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -621,6 +621,7 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
+                <ref bean="uk_removeGatewayKeyName"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_addTrustRoots"/>
diff --git a/mdx/uk/remove_gw_keyname.xsl b/mdx/uk/remove_gw_keyname.xsl
new file mode 100644
index 00000000..bf2b745d
--- /dev/null
+++ b/mdx/uk/remove_gw_keyname.xsl
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	remove_gw_keyname.xsl
+
+	Remove the Athens gateway's KeyName from all entities.
+	
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	exclude-result-prefixes="md">
+
+	<!--Force UTF-8 encoding for the output.-->
+	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
+
+	<xsl:template match="ds:KeyName[.='gateway.athensams.net']">
+		<!-- do nothing -->
+	</xsl:template>
+	
+	<!--By default, copy text blocks, comments and attributes unchanged.-->
+	<xsl:template match="text()|comment()|@*">
+		<xsl:copy/>
+	</xsl:template>
+	
+	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
+	<xsl:template match="*">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+</xsl:stylesheet>