diff --git a/build.xml b/build.xml
index b4b341b6..99185c3e 100644
--- a/build.xml
+++ b/build.xml
@@ -625,16 +625,16 @@
 		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
 		<element name="args" optional="yes"/>
 		<sequential>
-			<java classname="edu.internet2.middleware.security.XmlSecTool"
+			<java classname="org.opensaml.xml.util.XmlTool"
 				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="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool}"/>
-				<args/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/lib/endorsed"/>
+				<jvmarg value="-Dorg.opensaml.xml.util.XmlTool.home=${tools.xmlsectool}"/>
+				<args/>
 				<arg value="--validateSchema"/>
 				<arg value="--schemaDirectory"/>
 				<arg value="${xml.dir}"/>
diff --git a/tools/xmlsectool/endorsed/xercesImpl-2.9.1.jar b/tools/xmlsectool/endorsed/xercesImpl-2.9.1.jar
deleted file mode 100644
index 8f762e1a..00000000
Binary files a/tools/xmlsectool/endorsed/xercesImpl-2.9.1.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/commons-collections-3.1.jar b/tools/xmlsectool/lib/commons-collections-3.1.jar
new file mode 100644
index 00000000..41e230fe
Binary files /dev/null and b/tools/xmlsectool/lib/commons-collections-3.1.jar differ
diff --git a/tools/xmlsectool/lib/commons-lang-2.1.jar b/tools/xmlsectool/lib/commons-lang-2.1.jar
new file mode 100644
index 00000000..87b80ab5
Binary files /dev/null and b/tools/xmlsectool/lib/commons-lang-2.1.jar differ
diff --git a/tools/xmlsectool/endorsed/resolver-2.9.1.jar b/tools/xmlsectool/lib/endorsed/resolver-2.10.0.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/resolver-2.9.1.jar
rename to tools/xmlsectool/lib/endorsed/resolver-2.10.0.jar
diff --git a/tools/xmlsectool/endorsed/serializer-2.9.1.jar b/tools/xmlsectool/lib/endorsed/serializer-2.10.0.jar
similarity index 100%
rename from tools/xmlsectool/endorsed/serializer-2.9.1.jar
rename to tools/xmlsectool/lib/endorsed/serializer-2.10.0.jar
diff --git a/tools/xmlsectool/lib/endorsed/serializer-2.7.1.jar b/tools/xmlsectool/lib/endorsed/serializer-2.7.1.jar
new file mode 100644
index 00000000..99f98db9
Binary files /dev/null and b/tools/xmlsectool/lib/endorsed/serializer-2.7.1.jar differ
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/lib/endorsed/xercesImpl-2.10.0.jar b/tools/xmlsectool/lib/endorsed/xercesImpl-2.10.0.jar
new file mode 100644
index 00000000..9dcd8c38
Binary files /dev/null and b/tools/xmlsectool/lib/endorsed/xercesImpl-2.10.0.jar differ
diff --git a/tools/xmlsectool/endorsed/xml-apis-2.9.1.jar b/tools/xmlsectool/lib/endorsed/xml-apis-2.10.0.jar
similarity index 52%
rename from tools/xmlsectool/endorsed/xml-apis-2.9.1.jar
rename to tools/xmlsectool/lib/endorsed/xml-apis-2.10.0.jar
index d42c0ea6..46733464 100644
Binary files a/tools/xmlsectool/endorsed/xml-apis-2.9.1.jar and b/tools/xmlsectool/lib/endorsed/xml-apis-2.10.0.jar differ
diff --git a/tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar b/tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar
new file mode 100644
index 00000000..e535bdc0
Binary files /dev/null and b/tools/xmlsectool/lib/endorsed/xml-resolver-1.2.jar differ
diff --git a/tools/xmlsectool/lib/jcl-over-slf4j-1.5.11.jar b/tools/xmlsectool/lib/jcl-over-slf4j-1.6.1.jar
similarity index 51%
rename from tools/xmlsectool/lib/jcl-over-slf4j-1.5.11.jar
rename to tools/xmlsectool/lib/jcl-over-slf4j-1.6.1.jar
index 11355c2a..c44d8deb 100644
Binary files a/tools/xmlsectool/lib/jcl-over-slf4j-1.5.11.jar and b/tools/xmlsectool/lib/jcl-over-slf4j-1.6.1.jar differ
diff --git a/tools/xmlsectool/lib/joda-time-1.6.jar b/tools/xmlsectool/lib/joda-time-1.6.2.jar
similarity index 69%
rename from tools/xmlsectool/lib/joda-time-1.6.jar
rename to tools/xmlsectool/lib/joda-time-1.6.2.jar
index 68068a4b..9b045c36 100644
Binary files a/tools/xmlsectool/lib/joda-time-1.6.jar and b/tools/xmlsectool/lib/joda-time-1.6.2.jar differ
diff --git a/tools/xmlsectool/lib/jul-to-slf4j-1.5.10.jar b/tools/xmlsectool/lib/jul-to-slf4j-1.5.10.jar
deleted file mode 100644
index 84b7846a..00000000
Binary files a/tools/xmlsectool/lib/jul-to-slf4j-1.5.10.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/jul-to-slf4j-1.6.1.jar b/tools/xmlsectool/lib/jul-to-slf4j-1.6.1.jar
new file mode 100644
index 00000000..e240f3b6
Binary files /dev/null and b/tools/xmlsectool/lib/jul-to-slf4j-1.6.1.jar differ
diff --git a/tools/xmlsectool/lib/log4j-over-slf4j-1.5.11.jar b/tools/xmlsectool/lib/log4j-over-slf4j-1.5.11.jar
deleted file mode 100644
index 4cf37e84..00000000
Binary files a/tools/xmlsectool/lib/log4j-over-slf4j-1.5.11.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/log4j-over-slf4j-1.6.1.jar b/tools/xmlsectool/lib/log4j-over-slf4j-1.6.1.jar
new file mode 100644
index 00000000..c4025f42
Binary files /dev/null and b/tools/xmlsectool/lib/log4j-over-slf4j-1.6.1.jar differ
diff --git a/tools/xmlsectool/lib/logback-classic-0.9.20.jar b/tools/xmlsectool/lib/logback-classic-0.9.20.jar
deleted file mode 100644
index 0068f73c..00000000
Binary files a/tools/xmlsectool/lib/logback-classic-0.9.20.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/logback-classic-0.9.27.jar b/tools/xmlsectool/lib/logback-classic-0.9.27.jar
new file mode 100644
index 00000000..aecd5190
Binary files /dev/null and b/tools/xmlsectool/lib/logback-classic-0.9.27.jar differ
diff --git a/tools/xmlsectool/lib/logback-core-0.9.20.jar b/tools/xmlsectool/lib/logback-core-0.9.27.jar
similarity index 58%
rename from tools/xmlsectool/lib/logback-core-0.9.20.jar
rename to tools/xmlsectool/lib/logback-core-0.9.27.jar
index bf3e5153..f363bc0a 100644
Binary files a/tools/xmlsectool/lib/logback-core-0.9.20.jar and b/tools/xmlsectool/lib/logback-core-0.9.27.jar differ
diff --git a/tools/xmlsectool/lib/not-yet-commons-ssl-0.3.9.jar b/tools/xmlsectool/lib/not-yet-commons-ssl-0.3.9.jar
index cb1bee3a..9e38f97a 100644
Binary files a/tools/xmlsectool/lib/not-yet-commons-ssl-0.3.9.jar and b/tools/xmlsectool/lib/not-yet-commons-ssl-0.3.9.jar differ
diff --git a/tools/xmlsectool/lib/opensaml-2.4.1.jar b/tools/xmlsectool/lib/opensaml-2.4.1.jar
new file mode 100644
index 00000000..a20981da
Binary files /dev/null and b/tools/xmlsectool/lib/opensaml-2.4.1.jar differ
diff --git a/tools/xmlsectool/lib/openws-1.3.1.jar b/tools/xmlsectool/lib/openws-1.3.1.jar
deleted file mode 100644
index dda41439..00000000
Binary files a/tools/xmlsectool/lib/openws-1.3.1.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/openws-1.4.1.jar b/tools/xmlsectool/lib/openws-1.4.1.jar
new file mode 100644
index 00000000..33db958e
Binary files /dev/null and b/tools/xmlsectool/lib/openws-1.4.1.jar differ
diff --git a/tools/xmlsectool/lib/shibboleth-jce-1.1.0.jar b/tools/xmlsectool/lib/shibboleth-jce-1.1.0.jar
new file mode 100644
index 00000000..2f78d404
Binary files /dev/null and b/tools/xmlsectool/lib/shibboleth-jce-1.1.0.jar differ
diff --git a/tools/xmlsectool/lib/slf4j-api-1.5.11.jar b/tools/xmlsectool/lib/slf4j-api-1.5.11.jar
deleted file mode 100644
index ccb8c724..00000000
Binary files a/tools/xmlsectool/lib/slf4j-api-1.5.11.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/slf4j-api-1.6.1.jar b/tools/xmlsectool/lib/slf4j-api-1.6.1.jar
new file mode 100644
index 00000000..f1f4fdd2
Binary files /dev/null and b/tools/xmlsectool/lib/slf4j-api-1.6.1.jar differ
diff --git a/tools/xmlsectool/lib/velocity-1.5.jar b/tools/xmlsectool/lib/velocity-1.5.jar
new file mode 100644
index 00000000..7c7f2c43
Binary files /dev/null and b/tools/xmlsectool/lib/velocity-1.5.jar differ
diff --git a/tools/xmlsectool/lib/xmlsec-1.4.3.jar b/tools/xmlsectool/lib/xmlsec-1.4.4.jar
similarity index 70%
rename from tools/xmlsectool/lib/xmlsec-1.4.3.jar
rename to tools/xmlsectool/lib/xmlsec-1.4.4.jar
index f4ae4033..595f2ecb 100644
Binary files a/tools/xmlsectool/lib/xmlsec-1.4.3.jar and b/tools/xmlsectool/lib/xmlsec-1.4.4.jar differ
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.1.jar b/tools/xmlsectool/lib/xmlsectool-1.1.1.jar
deleted file mode 100644
index ada946f8..00000000
Binary files a/tools/xmlsectool/lib/xmlsectool-1.1.1.jar and /dev/null differ
diff --git a/tools/xmlsectool/lib/xmlsectool-1.1.3.jar b/tools/xmlsectool/lib/xmlsectool-1.1.3.jar
new file mode 100644
index 00000000..5697b0b5
Binary files /dev/null and b/tools/xmlsectool/lib/xmlsectool-1.1.3.jar differ
diff --git a/tools/xmlsectool/lib/xmltooling-1.2.2.jar b/tools/xmlsectool/lib/xmltooling-1.3.1.jar
similarity index 69%
rename from tools/xmlsectool/lib/xmltooling-1.2.2.jar
rename to tools/xmlsectool/lib/xmltooling-1.3.1.jar
index 76d8ccdd..31f774bd 100644
Binary files a/tools/xmlsectool/lib/xmltooling-1.2.2.jar and b/tools/xmlsectool/lib/xmltooling-1.3.1.jar differ