diff --git a/build.xml b/build.xml
index 7c6f81e1..e54d459a 100644
--- a/build.xml
+++ b/build.xml
@@ -1588,7 +1588,6 @@
         The individual properties listed here can be augmented or overridden
         by properties defined in the external properties files, e.g., build.properties.
     -->
-    <property name="mda.java.endorsed.dirs" value="${tools.dir}/endorsed"/>
     <property name="mda.blocklists.dir" value="${blocklists.dir}"/>
     <property name="mda.cacheDuration.aggregate.duration" value="${cacheDuration.aggregate.duration}"/>
     <property name="mda.cacheDuration.perEntity.duration" value="${cacheDuration.perEntity.duration}"/>
@@ -1629,18 +1628,44 @@
                     <pathelement path="${mdx.dir}"/>
 
                     <!-- Include all APIs we may want to use. -->
+
+                    <!-- The Shibboleth MDA. -->
                     <fileset dir="${tools.mda}/lib">
                         <include name="*.jar"/>
                     </fileset>
+
+                    <!-- UK federation MDA beans, and ukf-members. -->
                     <fileset dir="${tools.dir}/ukf-mda">
                         <include name="*.jar"/>
                     </fileset>
-                    <fileset dir="${tools.dir}/xalan/lib">
-                        <include name="sdss-xalan-md-*.jar"/>
-                    </fileset>
+
+                    <!-- InCommon MDA beans. -->
                     <fileset dir="${tools.dir}/inc-mda">
                         <include name="*.jar"/>
                     </fileset>
+
+                    <!-- Support libraries for any of the above. -->
+                    <fileset dir="${tools.dir}/lib">
+                        <include name="*.jar"/>
+                    </fileset>
+
+                    <!--
+                        Use Xalan as our XML processor.
+                        Note: this is not the old endorsement mechanism,
+                        despite the directory name. Instead, we just load
+                        it via the classpath.
+                    -->
+                    <fileset dir="${tools.dir}/xalan/impl">
+                        <include name="*.jar"/>
+                    </fileset>
+
+                    <!--
+                        Xalan-dependent UK federation classes.
+                    -->
+                    <fileset dir="${tools.dir}/xalan/lib">
+                        <include name="sdss-xalan-md-*.jar"/>
+                    </fileset>
+
                 </classpath>
                 <syspropertyset>
                     <propertyset refid="mda.properties"/>
diff --git a/tools/lib/istack-commons-runtime-3.0.8.jar b/tools/lib/istack-commons-runtime-3.0.8.jar
new file mode 100644
index 00000000..8f37e950
Binary files /dev/null and b/tools/lib/istack-commons-runtime-3.0.8.jar differ
diff --git a/tools/lib/jakarta.activation-1.2.2.jar b/tools/lib/jakarta.activation-1.2.2.jar
new file mode 100644
index 00000000..bddea495
Binary files /dev/null and b/tools/lib/jakarta.activation-1.2.2.jar differ
diff --git a/tools/lib/jakarta.xml.bind-api-2.3.2.jar b/tools/lib/jakarta.xml.bind-api-2.3.2.jar
new file mode 100644
index 00000000..b16236d5
Binary files /dev/null and b/tools/lib/jakarta.xml.bind-api-2.3.2.jar differ
diff --git a/tools/lib/jaxb-runtime-2.3.2.jar b/tools/lib/jaxb-runtime-2.3.2.jar
new file mode 100644
index 00000000..62f87196
Binary files /dev/null and b/tools/lib/jaxb-runtime-2.3.2.jar differ
diff --git a/tools/xalan/endorsed/resolver-2.9.1.jar b/tools/xalan/endorsed/resolver-2.9.1.jar
deleted file mode 100644
index e535bdc0..00000000
Binary files a/tools/xalan/endorsed/resolver-2.9.1.jar and /dev/null differ
diff --git a/tools/xalan/endorsed/serializer-2.9.1.jar b/tools/xalan/endorsed/serializer-2.9.1.jar
deleted file mode 100644
index de9b007b..00000000
Binary files a/tools/xalan/endorsed/serializer-2.9.1.jar and /dev/null differ
diff --git a/tools/xalan/endorsed/xalan-2.7.1.jar b/tools/xalan/endorsed/xalan-2.7.1.jar
deleted file mode 100644
index 458fa73d..00000000
Binary files a/tools/xalan/endorsed/xalan-2.7.1.jar and /dev/null differ
diff --git a/tools/xalan/endorsed/xercesImpl-2.9.1.jar b/tools/xalan/endorsed/xercesImpl-2.9.1.jar
deleted file mode 100644
index 8f762e1a..00000000
Binary files a/tools/xalan/endorsed/xercesImpl-2.9.1.jar and /dev/null differ
diff --git a/tools/xalan/endorsed/xml-apis-2.9.1.jar b/tools/xalan/endorsed/xml-apis-2.9.1.jar
deleted file mode 100644
index d42c0ea6..00000000
Binary files a/tools/xalan/endorsed/xml-apis-2.9.1.jar and /dev/null differ
diff --git a/tools/endorsed/serializer-2.11.0.jar b/tools/xalan/impl/serializer-2.11.0.jar
similarity index 100%
rename from tools/endorsed/serializer-2.11.0.jar
rename to tools/xalan/impl/serializer-2.11.0.jar
diff --git a/tools/endorsed/xalan-2.7.1.jar b/tools/xalan/impl/xalan-2.7.1.jar
similarity index 100%
rename from tools/endorsed/xalan-2.7.1.jar
rename to tools/xalan/impl/xalan-2.7.1.jar
diff --git a/tools/endorsed/xercesImpl-2.11.0.jar b/tools/xalan/impl/xercesImpl-2.11.0.jar
similarity index 100%
rename from tools/endorsed/xercesImpl-2.11.0.jar
rename to tools/xalan/impl/xercesImpl-2.11.0.jar
diff --git a/tools/endorsed/xml-apis-2.11.0.jar b/tools/xalan/impl/xml-apis-2.11.0.jar
similarity index 100%
rename from tools/endorsed/xml-apis-2.11.0.jar
rename to tools/xalan/impl/xml-apis-2.11.0.jar
diff --git a/tools/endorsed/xml-resolver-1.2.jar b/tools/xalan/impl/xml-resolver-1.2.jar
similarity index 100%
rename from tools/endorsed/xml-resolver-1.2.jar
rename to tools/xalan/impl/xml-resolver-1.2.jar