diff --git a/build.xml b/build.xml
index ba541dac..9f1df75e 100644
--- a/build.xml
+++ b/build.xml
@@ -37,13 +37,9 @@
 		Location of externally supplied tool bundles.
 	-->
 	<property name="tools.dir" value="tools"/>
-	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
+	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
+	<property name="tools.xalan" value="${tools.dir}/xalan"/>
 	
-	<!--
-		Endorsed libraries for everything except metadatatool.
-	-->
-	<property name="endorsed.dir" value="endorsed"/>
-	
 	<!--
 		Additional ANT task definitions.
 	-->
@@ -548,7 +544,7 @@
 				<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
 				<pathelement path="${bin.dir}"/>
 			</classpath>
-			<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
+			<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
 			<arg value="-IN"/>
 			<arg value="${entities.dir}/import.xml"/>
 			<arg value="-OUT"/>
@@ -588,7 +584,7 @@
 					<pathelement location="${lib.dir}/joda-time-1.6.jar"/>
 					<pathelement path="${bin.dir}"/>
 				</classpath>
-				<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}"/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xalan}/endorsed"/>
 				<arg value="@{i}"/>
 				<arg value="${build.dir}/@{s}"/>
 			</java>
diff --git a/build/import.pl b/build/import.pl
index b5a61672..0ba3340f 100755
--- a/build/import.pl
+++ b/build/import.pl
@@ -11,4 +11,4 @@
 #		./check_entity 123
 #
 
-system("java -cp ../bin:../lib/joda-time-1.6.jar -Djava.endorsed.dirs=../endorsed org.apache.xalan.xslt.Process -IN ../entities/import.xml -OUT ../entities/imported.xml -XSL import.xsl");
+system("java -cp ../bin:../lib/joda-time-1.6.jar -Djava.endorsed.dirs=../tools/xalan/endorsed org.apache.xalan.xslt.Process -IN ../entities/import.xml -OUT ../entities/imported.xml -XSL import.xsl");
diff --git a/tools/xalan/endorsed/resolver-2.9.1.jar b/tools/xalan/endorsed/resolver-2.9.1.jar
new file mode 100644
index 00000000..e535bdc0
Binary files /dev/null and b/tools/xalan/endorsed/resolver-2.9.1.jar differ
diff --git a/tools/xalan/endorsed/serializer-2.9.1.jar b/tools/xalan/endorsed/serializer-2.9.1.jar
new file mode 100644
index 00000000..de9b007b
Binary files /dev/null and b/tools/xalan/endorsed/serializer-2.9.1.jar differ
diff --git a/tools/xalan/endorsed/xalan-2.7.1.jar b/tools/xalan/endorsed/xalan-2.7.1.jar
new file mode 100644
index 00000000..458fa73d
Binary files /dev/null and b/tools/xalan/endorsed/xalan-2.7.1.jar differ
diff --git a/tools/xalan/endorsed/xercesImpl-2.9.1.jar b/tools/xalan/endorsed/xercesImpl-2.9.1.jar
new file mode 100644
index 00000000..8f762e1a
Binary files /dev/null and b/tools/xalan/endorsed/xercesImpl-2.9.1.jar differ
diff --git a/tools/xalan/endorsed/xml-apis-2.9.1.jar b/tools/xalan/endorsed/xml-apis-2.9.1.jar
new file mode 100644
index 00000000..d42c0ea6
Binary files /dev/null and b/tools/xalan/endorsed/xml-apis-2.9.1.jar differ