diff --git a/mdx/clean-import.xsl b/mdx/clean-import.xsl
index e7c2211b..1b97b12b 100644
--- a/mdx/clean-import.xsl
+++ b/mdx/clean-import.xsl
@@ -9,12 +9,10 @@
 <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:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
     xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-    extension-element-prefixes="mdxTextUtils">
+    xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
     <!--Force UTF-8 encoding for the output.-->
     <xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
@@ -45,17 +43,6 @@
     <!-- Remove xsi:type from any entity attribute values. -->
     <xsl:template match="saml:AttributeValue/@xsi:type"/>
 
-    <!--
-        Normalise whitespace in X509Certificate elements.
-    -->
-    <xsl:template match="ds:X509Certificate">
-        <xsl:element name="ds:X509Certificate">
-            <xsl:text>&#10;</xsl:text>
-            <xsl:value-of select="mdxTextUtils:wrapBase64(.)"/>
-            <xsl:text>&#10;</xsl:text>
-        </xsl:element>
-    </xsl:template>
-
     <!--
         Discard various ds:X509 elements.  Several of these are known to
         cause problems with software systems, and they don't affect trust
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 4412c7c2..8c2df771 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -877,6 +877,9 @@
         ***************************
     -->
 
+    <bean id="ds-X509Certificate" parent="QName" c:_0-ref="ds_namespace"
+        c:_1="X509Certificate"/>
+
     <!--
         stripKeyNames
 
@@ -886,6 +889,15 @@
         p:elementName="KeyName"
         p:elementNamespace-ref="ds_namespace"/>
 
+    <!--
+        wrapX509Certificates
+
+        Normalise the text inside ds:X509Certificate elements by
+        removing all white space, then reformatting for 64 characters
+        per line.
+    -->
+    <bean id="wrapX509Certificates" parent="ukf.ElementBase64WrappingStage"
+        p:elementName-ref="ds-X509Certificate"/>
 
 
     <!--
@@ -1182,6 +1194,7 @@
                 </bean>
 
                 <ref bean="cleanImport"/>
+                <ref bean="wrapX509Certificates"/>
                 <ref bean="stripAAMDUI"/>
                 <ref bean="stripMDUILogoHttp"/>
                 <ref bean="trimImportElementWhitespace"/>
diff --git a/mdx/uk/import.xsl b/mdx/uk/import.xsl
index c1fd192d..f34be379 100644
--- a/mdx/uk/import.xsl
+++ b/mdx/uk/import.xsl
@@ -37,9 +37,6 @@
     xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 
-    xmlns:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
-    extension-element-prefixes="mdxTextUtils"
-
     xmlns:xalan="http://xml.apache.org/xalan"
 
     exclude-result-prefixes="idpdisc init md mdui xalan"
@@ -261,18 +258,6 @@
     </xsl:template>
 
 
-    <!--
-        Normalise whitespace in X509Certificate elements.
-    -->
-    <xsl:template match="ds:X509Certificate">
-        <xsl:element name="ds:X509Certificate">
-            <xsl:text>&#10;</xsl:text>
-            <xsl:value-of select="mdxTextUtils:wrapBase64(.)"/>
-            <xsl:text>&#10;</xsl:text>
-        </xsl:element>
-    </xsl:template>
-
-
     <!--
         Discard ds:X509SubjectName
     -->
diff --git a/mdx/uk/verbs.xml b/mdx/uk/verbs.xml
index dccb5058..c6448be9 100644
--- a/mdx/uk/verbs.xml
+++ b/mdx/uk/verbs.xml
@@ -329,6 +329,9 @@
                     </property>
                 </bean>
 
+                <!-- Normalise the text in ds:X509Certificate elements. -->
+                <ref bean="wrapX509Certificates"/>
+
                 <!-- normalise namespaces in a specific way -->
                 <bean id="normalizeFragment" parent="mda.XSLTransformationStage"
                     p:XSLResource="classpath:uk/ns_norm_fragment.xsl"/>