diff --git a/build.xml b/build.xml
index 4e4daeb9..f97349d2 100644
--- a/build.xml
+++ b/build.xml
@@ -660,10 +660,10 @@
 				fork="true" failonerror="true" maxmemory="${java.max.memory}">
 				<classpath>
 					<fileset dir="${tools.xmlsectool}/lib">
-						<include name="**/*.jar"/>
+						<include name="*.jar"/>
 					</fileset>
 				</classpath>
-				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/endorsed"/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/lib/endorsed"/>
 				<jvmarg value="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool}"/>
 				<args/>
 				<arg value="--validateSchema"/>
diff --git a/tools/xmlsectool/endorsed/serializer-2.10.0.jar b/tools/xmlsectool/lib/endorsed/serializer-2.10.0.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/serializer-2.10.0.jar
rename to tools/xmlsectool/lib/endorsed/serializer-2.10.0.jar
diff --git a/tools/xmlsectool/endorsed/xalan-2.7.1.jar b/tools/xmlsectool/lib/endorsed/xalan-2.7.1.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/xalan-2.7.1.jar
rename to tools/xmlsectool/lib/endorsed/xalan-2.7.1.jar
diff --git a/tools/xmlsectool/endorsed/xercesImpl-2.10.0.jar b/tools/xmlsectool/lib/endorsed/xercesImpl-2.10.0.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/xercesImpl-2.10.0.jar
rename to tools/xmlsectool/lib/endorsed/xercesImpl-2.10.0.jar
diff --git a/tools/xmlsectool/endorsed/xml-apis-2.10.0.jar b/tools/xmlsectool/lib/endorsed/xml-apis-2.10.0.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/xml-apis-2.10.0.jar
rename to tools/xmlsectool/lib/endorsed/xml-apis-2.10.0.jar
diff --git a/tools/xmlsectool/endorsed/xml-resolver-1.2.jar b/tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/xml-resolver-1.2.jar
rename to tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar
diff --git a/tools/xmlsectool/lib/openws-1.4.2.jar b/tools/xmlsectool/lib/openws-1.4.2.jar
index c9f1b6e9..108826e1 100644
Binary files a/tools/xmlsectool/lib/openws-1.4.2.jar and b/tools/xmlsectool/lib/openws-1.4.2.jar differ
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.4.jar b/tools/xmlsectool/lib/xmlsectool-1.1.4.jar
deleted file mode 100644
index 8b10860f..00000000
Binary files a/tools/xmlsectool/lib/xmlsectool-1.1.4.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.5.jar b/tools/xmlsectool/lib/xmlsectool-1.1.5.jar
new file mode 100644
index 00000000..c699da1d
Binary files /dev/null and b/tools/xmlsectool/lib/xmlsectool-1.1.5.jar differ
diff --git a/tools/xmlsectool/lib/xmltooling-1.3.1.jar b/tools/xmlsectool/lib/xmltooling-1.3.1.jar
deleted file mode 100644
index 28caa820..00000000
Binary files a/tools/xmlsectool/lib/xmltooling-1.3.1.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/xmltooling-1.3.2.jar b/tools/xmlsectool/lib/xmltooling-1.3.2.jar
new file mode 100644
index 00000000..66e5272c
Binary files /dev/null and b/tools/xmlsectool/lib/xmltooling-1.3.2.jar differ