diff --git a/build.xml b/build.xml
index 3d46f5dc..ba541dac 100644
--- a/build.xml
+++ b/build.xml
@@ -417,7 +417,7 @@
 			<java classname="edu.internet2.middleware.shibboleth.utils.MetadataTool"
 				fork="true" failonerror="true" maxmemory="384m">
 				<classpath>
-					<fileset dir="${lib.dir}">
+					<fileset dir="${tools.metadatatool}/lib">
 						<include name="**/*.jar"/>
 					</fileset>
 				</classpath>
diff --git a/tools/metadatatool/lib/bcprov-jdk14-117.jar b/tools/metadatatool/lib/bcprov-jdk14-117.jar
new file mode 100644
index 00000000..1bac52ec
Binary files /dev/null and b/tools/metadatatool/lib/bcprov-jdk14-117.jar differ
diff --git a/tools/metadatatool/lib/commons-logging-1.03.jar b/tools/metadatatool/lib/commons-logging-1.03.jar
new file mode 100644
index 00000000..b99c9375
Binary files /dev/null and b/tools/metadatatool/lib/commons-logging-1.03.jar differ
diff --git a/tools/metadatatool/lib/jargs-0.4.jar b/tools/metadatatool/lib/jargs-0.4.jar
new file mode 100644
index 00000000..92d9b9bc
Binary files /dev/null and b/tools/metadatatool/lib/jargs-0.4.jar differ
diff --git a/tools/metadatatool/lib/log4j-1.2.5.jar b/tools/metadatatool/lib/log4j-1.2.5.jar
new file mode 100644
index 00000000..c7111d8b
Binary files /dev/null and b/tools/metadatatool/lib/log4j-1.2.5.jar differ
diff --git a/tools/metadatatool/lib/opensaml-1.1.jar b/tools/metadatatool/lib/opensaml-1.1.jar
new file mode 100644
index 00000000..0c2be2cc
Binary files /dev/null and b/tools/metadatatool/lib/opensaml-1.1.jar differ
diff --git a/tools/metadatatool/lib/shib-util.jar b/tools/metadatatool/lib/shib-util.jar
new file mode 100644
index 00000000..a6c04c7e
Binary files /dev/null and b/tools/metadatatool/lib/shib-util.jar differ
diff --git a/tools/metadatatool/lib/xmlsec-20050514.jar b/tools/metadatatool/lib/xmlsec-20050514.jar
new file mode 100644
index 00000000..4c7fb251
Binary files /dev/null and b/tools/metadatatool/lib/xmlsec-20050514.jar differ