diff --git a/build.xml b/build.xml
index c3e48597..23ae00c6 100644
--- a/build.xml
+++ b/build.xml
@@ -274,7 +274,7 @@
     <property name="tools.mda" value="${tools.dir}/aggregator-cli-0.9.2"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
     <property name="tools.slacktee" value="${tools.dir}/slacktee"/>
-    <property name="tools.xmlsectool" value="${tools.dir}/xmlsectool-2.0.0"/>
+    <property name="tools.xmlsectool" value="${tools.dir}/xmlsectool-3.0.0"/>
 
     <!--
         Location of configuration for externally supplied tool bundles.
@@ -1891,12 +1891,11 @@
                     <arg if:set="sign.uk.keystoreProvider" value="${sign.uk.keystoreProvider}"/>
 
                     <!--
-                        The "key" option can represent either a key file or a key alias.
-                        Different properties are used for the two cases (see XSTJ-67).
+                        Indicate a key file or key alias as appropriate.
                     -->
-                    <arg if:set="sign.uk.keyFile" value="--key"/>
+                    <arg if:set="sign.uk.keyFile" value="--keyFile"/>
                     <arg if:set="sign.uk.keyFile" value="${sign.uk.keyFile}"/>
-                    <arg if:set="sign.uk.keyAlias" value="--key"/>
+                    <arg if:set="sign.uk.keyAlias" value="--keyAlias"/>
                     <arg if:set="sign.uk.keyAlias" value="${sign.uk.keyAlias}"/>
 
                     <!--
diff --git a/preprod.properties b/preprod.properties
index c71ba326..e91a0140 100644
--- a/preprod.properties
+++ b/preprod.properties
@@ -4,11 +4,6 @@
 # Properties defined for the env=preprod deployment environment.
 #
 
-#
-# Use the PKCS#11 provider for signatures.
-#
-sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
-
 #
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
diff --git a/prod.properties b/prod.properties
index 3a1090b6..41f3b326 100644
--- a/prod.properties
+++ b/prod.properties
@@ -4,11 +4,6 @@
 # Properties defined for the env=prod deployment environment.
 #
 
-#
-# Use the PKCS#11 provider for signatures.
-#
-sign.uk.keystoreProvider = sun.security.pkcs11.SunPKCS11
-
 #
 # Location of the PKCS#11 configuration file for the Thales HSM.
 #
diff --git a/tools/xmlsectool-3.0.0/doc/LICENSE.txt b/tools/xmlsectool-3.0.0/doc/LICENSE.txt
new file mode 100644
index 00000000..261eeb9e
--- /dev/null
+++ b/tools/xmlsectool-3.0.0/doc/LICENSE.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/tools/xmlsectool-3.0.0/doc/xmlsectool.patch b/tools/xmlsectool-3.0.0/doc/xmlsectool.patch
new file mode 100644
index 00000000..bcbbd039
--- /dev/null
+++ b/tools/xmlsectool-3.0.0/doc/xmlsectool.patch
@@ -0,0 +1,22 @@
+diff -Naur xmlsectool.orig/xmlsectool.sh xmlsectool/xmlsectool.sh
+--- xmlsectool.orig/xmlsectool.sh	2011-02-18 16:50:21.000000000 +0100
++++ xmlsectool/xmlsectool.sh	2011-02-18 16:49:58.000000000 +0100
+@@ -6,8 +6,7 @@
+ declare LOCALCLASSPATH
+ declare LIBDIR
+ 
+-LOCATION=$0
+-LOCATION=${LOCATION%/*}
++LOCATION=/usr/share/java/xmlsectool
+ 
+ if [ -z "$JAVA_HOME" ] ; then
+   echo "ERROR: JAVA_HOME environment variable is not set."
+@@ -30,7 +29,7 @@
+ LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+ 
+ # add in the dependency .jar files from the lib directory
+-LIBDIR=$LOCATION/lib
++LIBDIR=$LOCATION
+ LIBS=$LIBDIR/*.jar
+ for i in $LIBS
+ do
diff --git a/tools/xmlsectool-3.0.0/doc/xmlsectool.spec b/tools/xmlsectool-3.0.0/doc/xmlsectool.spec
new file mode 100644
index 00000000..dee6d4cf
--- /dev/null
+++ b/tools/xmlsectool-3.0.0/doc/xmlsectool.spec
@@ -0,0 +1,78 @@
+%define unzip /usr/bin/unzip
+%define scriptname xmlsectool
+Summary: Java command line tool for checking and verifying XML documents
+Name: xmlsectool
+Version: 2.0.0
+Release: 1
+Epoch: 0
+License: Apache License 2.0
+Group: System Environment/Libraries
+Source0: http://shibboleth.net/downloads/tools/%{name}/%{version}/%{name}-%{version}-bin.zip
+Patch0: xmlsectool.patch
+URL: https://wiki.shibboleth.net/confluence/display/XSTJ/
+Requires: java >= 1.7.0
+BuildRequires: unzip
+BuildArch: noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%(id -u -n)
+
+%description
+The xmlsectool is a Java command line tool that can download, check
+well-formedness, schema validity, and signature of an XML document.
+It can also create enveloped signatures of an XML document.
+
+%prep
+%{__rm} -rf %{name}-%{version}
+%{unzip} -q $RPM_SOURCE_DIR/%{name}-%{version}-bin.zip
+cd %{name}-%{version}
+
+%patch0 -p1
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+
+install -d %{buildroot}%{_bindir}
+install $RPM_BUILD_DIR/%{name}-%{version}/%{scriptname}.sh %{buildroot}%{_bindir}/%{scriptname}
+
+install -d %{buildroot}%{_javadir}/%{name}
+install -m644 $RPM_BUILD_DIR/%{name}-%{version}/lib/*.jar %{buildroot}%{_javadir}/%{name}
+
+install -d %{buildroot}%{_docdir}/%{name}
+install -m644 $RPM_BUILD_DIR/%{name}-%{version}/doc/* %{buildroot}%{_docdir}/%{name}
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root, -)
+%attr(755,root,root) %{_bindir}/%{scriptname}
+%doc %{_docdir}/%{name}/*
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*
+
+%changelog
+* Fri May 27 2016 Ian Young <ian@iay.org.uk> 2.0.0-1
+- update to latest version
+
+* Mon Mar 04 2013 Ian Young <ian@iay.org.uk> 1.2.0-1
+- Import into xmlsectool package, update to latest version.
+
+* Wed Apr 06 2011 Peter Schober <peter.schober@univie.ac.at> 1.1.3-2
+- Remove version numbers from patch file and patch with -p1
+
+* Wed Apr 06 2011 Peter Schober <peter.schober@univie.ac.at> 1.1.3-1
+- Update to upstream version 1.1.3
+
+* Tue Apr 05 2011 Peter Schober <peter.schober@univie.ac.at> 1.1.2-2
+- Changed Source URL (downloads moved to shibboleth.net)
+
+* Tue Apr 05 2011 Peter Schober <peter.schober@univie.ac.at> 1.1.2-1
+- Update to upstream version 1.1.2
+- Changed scriptname
+- Changed URL (Wiki moved to shibboleth.net)
+
+* Fri Feb 18 2011 Peter Schober <peter.schober@univie.ac.at> 1.1.1-2
+- Move jar files from lib/ and patch shell wrapper accordingly,
+  use _javadir macro (instead of _datadir/java).
+
+* Fri Feb 18 2011 Peter Schober <peter.schober@univie.ac.at> 1.1.1-1
+- Initial package
diff --git a/tools/xmlsectool-3.0.0/lib/bcpkix-jdk15on-1.67.jar b/tools/xmlsectool-3.0.0/lib/bcpkix-jdk15on-1.67.jar
new file mode 100644
index 00000000..402d108c
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/bcpkix-jdk15on-1.67.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/bcprov-jdk15on-1.67.jar b/tools/xmlsectool-3.0.0/lib/bcprov-jdk15on-1.67.jar
new file mode 100644
index 00000000..94aae290
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/bcprov-jdk15on-1.67.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/checker-qual-3.5.0.jar b/tools/xmlsectool-3.0.0/lib/checker-qual-3.5.0.jar
new file mode 100644
index 00000000..f98cde8b
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/checker-qual-3.5.0.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/commons-codec-1.15.jar b/tools/xmlsectool-3.0.0/lib/commons-codec-1.15.jar
new file mode 100644
index 00000000..f14985ac
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/commons-codec-1.15.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/cryptacular-1.2.4.jar b/tools/xmlsectool-3.0.0/lib/cryptacular-1.2.4.jar
new file mode 100644
index 00000000..06214161
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/cryptacular-1.2.4.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/error_prone_annotations-2.3.4.jar b/tools/xmlsectool-3.0.0/lib/error_prone_annotations-2.3.4.jar
new file mode 100644
index 00000000..c9bea2ab
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/error_prone_annotations-2.3.4.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/failureaccess-1.0.1.jar b/tools/xmlsectool-3.0.0/lib/failureaccess-1.0.1.jar
new file mode 100644
index 00000000..9b56dc75
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/failureaccess-1.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/guava-30.0-jre.jar b/tools/xmlsectool-3.0.0/lib/guava-30.0-jre.jar
new file mode 100644
index 00000000..f3a78184
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/guava-30.0-jre.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/httpclient-4.5.13.jar b/tools/xmlsectool-3.0.0/lib/httpclient-4.5.13.jar
new file mode 100644
index 00000000..218ee25f
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/httpclient-4.5.13.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/httpcore-4.4.13.jar b/tools/xmlsectool-3.0.0/lib/httpcore-4.4.13.jar
new file mode 100644
index 00000000..163dc438
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/httpcore-4.4.13.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/istack-commons-runtime-3.0.11.jar b/tools/xmlsectool-3.0.0/lib/istack-commons-runtime-3.0.11.jar
new file mode 100644
index 00000000..c6aa5d2b
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/istack-commons-runtime-3.0.11.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/j2objc-annotations-1.3.jar b/tools/xmlsectool-3.0.0/lib/j2objc-annotations-1.3.jar
new file mode 100644
index 00000000..a429c721
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/j2objc-annotations-1.3.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/jakarta.activation-1.2.2.jar b/tools/xmlsectool-3.0.0/lib/jakarta.activation-1.2.2.jar
new file mode 100644
index 00000000..bddea495
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jakarta.activation-1.2.2.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/jakarta.xml.bind-api-2.3.3.jar b/tools/xmlsectool-3.0.0/lib/jakarta.xml.bind-api-2.3.3.jar
new file mode 100644
index 00000000..b8c7dc1e
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jakarta.xml.bind-api-2.3.3.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/java-support-8.1.0.jar b/tools/xmlsectool-3.0.0/lib/java-support-8.1.0.jar
new file mode 100644
index 00000000..0f497ab0
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/java-support-8.1.0.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/jaxb-runtime-2.3.3.jar b/tools/xmlsectool-3.0.0/lib/jaxb-runtime-2.3.3.jar
new file mode 100644
index 00000000..f950209c
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jaxb-runtime-2.3.3.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/jcl-over-slf4j-1.7.30.jar b/tools/xmlsectool-3.0.0/lib/jcl-over-slf4j-1.7.30.jar
new file mode 100644
index 00000000..44e9f639
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jcl-over-slf4j-1.7.30.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/jcommander-1.78.jar b/tools/xmlsectool-3.0.0/lib/jcommander-1.78.jar
new file mode 100644
index 00000000..1d586730
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jcommander-1.78.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/jsr305-3.0.2.jar b/tools/xmlsectool-3.0.0/lib/jsr305-3.0.2.jar
new file mode 100644
index 00000000..59222d9c
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/jsr305-3.0.2.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar b/tools/xmlsectool-3.0.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
new file mode 100644
index 00000000..45832c05
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/logback-classic-1.2.3.jar b/tools/xmlsectool-3.0.0/lib/logback-classic-1.2.3.jar
new file mode 100644
index 00000000..bed00c0a
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/logback-classic-1.2.3.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/logback-core-1.2.3.jar b/tools/xmlsectool-3.0.0/lib/logback-core-1.2.3.jar
new file mode 100644
index 00000000..487b3956
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/logback-core-1.2.3.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/metrics-core-4.1.14.jar b/tools/xmlsectool-3.0.0/lib/metrics-core-4.1.14.jar
new file mode 100644
index 00000000..23026b9a
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/metrics-core-4.1.14.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-core-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-core-4.0.1.jar
new file mode 100644
index 00000000..8477e567
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-core-4.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-messaging-api-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-messaging-api-4.0.1.jar
new file mode 100644
index 00000000..2764fbcb
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-messaging-api-4.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-security-api-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-security-api-4.0.1.jar
new file mode 100644
index 00000000..ea158a8b
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-security-api-4.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-security-impl-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-security-impl-4.0.1.jar
new file mode 100644
index 00000000..8835bcbf
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-security-impl-4.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-api-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-api-4.0.1.jar
new file mode 100644
index 00000000..39724a7c
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-api-4.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-impl-4.0.1.jar b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-impl-4.0.1.jar
new file mode 100644
index 00000000..b9fb346a
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/opensaml-xmlsec-impl-4.0.1.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/slf4j-api-1.7.30.jar b/tools/xmlsectool-3.0.0/lib/slf4j-api-1.7.30.jar
new file mode 100644
index 00000000..29ac26fb
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/slf4j-api-1.7.30.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/txw2-2.3.3.jar b/tools/xmlsectool-3.0.0/lib/txw2-2.3.3.jar
new file mode 100644
index 00000000..363dd1b6
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/txw2-2.3.3.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/xmlsec-2.1.5.jar b/tools/xmlsectool-3.0.0/lib/xmlsec-2.1.5.jar
new file mode 100644
index 00000000..aca83b6d
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/xmlsec-2.1.5.jar differ
diff --git a/tools/xmlsectool-3.0.0/lib/xmlsectool-3.0.0.jar b/tools/xmlsectool-3.0.0/lib/xmlsectool-3.0.0.jar
new file mode 100644
index 00000000..37889268
Binary files /dev/null and b/tools/xmlsectool-3.0.0/lib/xmlsectool-3.0.0.jar differ
diff --git a/tools/xmlsectool-3.0.0/xmlsectool.sh b/tools/xmlsectool-3.0.0/xmlsectool.sh
new file mode 100755
index 00000000..6abfca8a
--- /dev/null
+++ b/tools/xmlsectool-3.0.0/xmlsectool.sh
@@ -0,0 +1,49 @@
+#! /bin/bash
+
+#
+# See the Javadoc for the XMLSecTool main class for documentation
+# of non-zero exit codes.
+#
+
+declare LOCATION
+declare COMMAND
+declare JAVACMD
+declare LOCALCLASSPATH
+declare LIBDIR
+
+LOCATION=$0
+LOCATION=${LOCATION%/*}
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "ERROR: JAVA_HOME environment variable is not set."
+  exit 8
+else
+  if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+    # IBM's JDK on AIX uses strange locations for the executables
+    JAVACMD=$JAVA_HOME/jre/sh/java
+  else
+    JAVACMD=$JAVA_HOME/bin/java
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 9
+fi
+
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+
+# add in the dependency .jar files from the lib directory
+LIBDIR=$LOCATION/lib
+LIBS=$LIBDIR/*.jar
+for i in $LIBS
+do
+    # if the directory is empty, then it will return the input string
+    # this is stupid, so case for it
+    if [ "$i" != "${LIBS}" ] ; then
+        LOCALCLASSPATH=$LOCALCLASSPATH:"$i"
+    fi
+done
+
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JVMOPTS '-Dnet.shibboleth.tool.xmlsectool.XMLSecTool.home='"$LOCATION" 'net.shibboleth.tool.xmlsectool.XMLSecTool' "$@"