diff --git a/build.xml b/build.xml
index 439edf0f..3d46f5dc 100644
--- a/build.xml
+++ b/build.xml
@@ -32,13 +32,16 @@
 	<property name="templates.dir" value="templates"/>
 	<property name="xalan.dir" value="xalan-j_2_6_0"/>
 	<property name="xml.dir" value="xml"/>
-
+
+	<!--
+		Location of externally supplied tool bundles.
+	-->
+	<property name="tools.dir" value="tools"/>
+	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
+	
 	<!--
-		Endorsed libraries.
+		Endorsed libraries for everything except metadatatool.
 	-->
-	<!-- endorsed libraries for metadatatool -->
-	<property name="endorsed.mdt.dir" value="endorsed-mdt"/>
-	<!-- endorsed libraries for everything except metadatatool -->
 	<property name="endorsed.dir" value="endorsed"/>
 	
 	<!--
@@ -422,7 +425,7 @@
 					metadatatool requires its own variant of
 					the endorsed libraries.
 				-->
-				<jvmarg value="-Djava.endorsed.dirs=${endorsed.mdt.dir}"/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.metadatatool}/endorsed"/>
 				<!--
 				<jvmarg value="-Dlog4j.configuration=log4j.properties"/>
 				-->
diff --git a/tools/metadatatool/endorsed/dom.jar b/tools/metadatatool/endorsed/dom.jar
new file mode 100644
index 00000000..d92fa7b2
Binary files /dev/null and b/tools/metadatatool/endorsed/dom.jar differ
diff --git a/tools/metadatatool/endorsed/jaxp-api.jar b/tools/metadatatool/endorsed/jaxp-api.jar
new file mode 100644
index 00000000..ad97b97e
Binary files /dev/null and b/tools/metadatatool/endorsed/jaxp-api.jar differ
diff --git a/tools/metadatatool/endorsed/sax.jar b/tools/metadatatool/endorsed/sax.jar
new file mode 100644
index 00000000..c159c486
Binary files /dev/null and b/tools/metadatatool/endorsed/sax.jar differ
diff --git a/tools/metadatatool/endorsed/xalan.jar b/tools/metadatatool/endorsed/xalan.jar
new file mode 100644
index 00000000..f70243a5
Binary files /dev/null and b/tools/metadatatool/endorsed/xalan.jar differ
diff --git a/tools/metadatatool/endorsed/xercesImpl.jar b/tools/metadatatool/endorsed/xercesImpl.jar
new file mode 100644
index 00000000..2bffa15c
Binary files /dev/null and b/tools/metadatatool/endorsed/xercesImpl.jar differ