diff --git a/build.xml b/build.xml
index 4b6a12d3..41cacd36 100644
--- a/build.xml
+++ b/build.xml
@@ -1470,6 +1470,8 @@
         <sequential>
             <java classname="net.shibboleth.metadata.cli.SimpleCommandLine"
                 fork="true" failonerror="true" maxmemory="${java.max.memory}">
+                <sysproperty key="java.library.path" path="${mda.jni.path}"
+                    if:set="mda.jni.path"/>
                 <classpath>
                     <!-- Spring "classpath:" imports can be under the MDX directory -->
                     <pathelement path="${mdx.dir}"/>
@@ -1487,6 +1489,12 @@
                     <fileset dir="${tools.dir}/inc-mda">
                         <include name="*.jar"/>
                     </fileset>
+
+                    <!-- Include a per-target directory if set. -->
+                    <fileset dir="${tools.dir}">
+                        <include name="${mda.classpath.extra}/*.jar"
+                            if="mda.classpath.extra"/>
+                    </fileset>
                 </classpath>
                 <syspropertyset>
                     <propertyset refid="mda.properties"/>