diff --git a/ant/plugin.properties b/ant/plugin.properties
index 7abf9a5b..fb7c356a 100644
--- a/ant/plugin.properties
+++ b/ant/plugin.properties
@@ -23,4 +23,5 @@
 
 maven.ant.generatebuild.file = ${basedir}/build.xml
 maven.ant.use.properties     = true
-maven.ant.compatibility      = 1.6
\ No newline at end of file
+maven.ant.compatibility      = 1.6
+maven.ant.use.multirepo      = true
\ No newline at end of file
diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index d5b48e2b..f29d613f 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -25,19 +25,23 @@
   xmlns="dummy">
 
   <ant:tstamp />
-  <!-- get first repo in the list -->
-  <u:tokenize var="repos" delim=",">${maven.repo.remote}</u:tokenize>
-  <j:set var="repo">${repos[0]}</j:set>
-  <!-- set up relative paths -->
-  <maven:makeRelativePath var="srcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" separator="/"/>
-
-  <j:if test="${unitTestSourcesPresent == 'true'}">
-    <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" separator="/"/>
-  </j:if>
 
   <j:set var="antComp" value="${maven.ant.compatibility}"/>
   <ant:echo>Compatibility : Ant ${antComp}</ant:echo>
 
+  <!-- set up relative paths -->
+  <j:set var="baseDirFile" value="${pom.file.canonicalFile.parentFile}"/>
+  <maven:makeRelativePath var="srcDirRP" basedir="${baseDirFile}" path="${pom.build.sourceDirectory}" separator="/"/>
+  <j:if test="${unitTestSourcesPresent == 'true'}">
+  <maven:makeRelativePath var="testSrcDirRP" basedir="${baseDirFile}" path="${pom.build.unitTestSourceDirectory}" separator="/"/>
+  <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest" var="abstestclassesdir" />
+  <maven:makeRelativePath var="testclassesdirRP" basedir="${baseDirFile}" path="${abstestclassesdir}" separator="/"/>
+  <maven:pluginVar plugin="maven-test-plugin" property="maven.test.reportsDirectory" var="abstestreportdir" />
+  <maven:makeRelativePath var="testreportdirRP" basedir="${baseDirFile}" path="${abstestreportdir}" separator="/"/>
+  </j:if>
+  <maven:makeRelativePath var="defaulttargetdirRP" basedir="${baseDirFile}" path="${maven.build.dir}" separator="/"/>
+  <maven:makeRelativePath var="classesdirRP" basedir="${baseDirFile}" path="${maven.build.dest}" separator="/"/>
+  
   <x:comment>
   build.xml generated by maven from project.xml version ${pom.currentVersion}
   on date ${TODAY}, time ${TSTAMP}
@@ -46,33 +50,23 @@
 <project name="${pom.artifactId}" default="jar" basedir=".">
   
   <j:if test="${maven.ant.use.properties}">
-  <!-- Load local and user build preferences -->
+  <x:comment>Load local and user build preferences</x:comment>
   <property file="build.properties"/>
   <property file="$${user.home}/build.properties"/>
   </j:if>
   
-  <j:set var="baseDirFile" value="${pom.file.canonicalFile.parentFile}"/>
-  <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.build.dir}" separator="/" var="defaulttargetdir"/>
-  <property name="defaulttargetdir" value="${defaulttargetdir}"/> 
-  <!--<property name="libdir" value="${defaulttargetdir}/lib" />-->
-  <property name="libdir" value="$${user.home}/.maven/repository" />
-  
-
-  <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.build.dest}" separator="/" var="classesdir"/>
-  <property name="classesdir" value="${classesdir}" />
+  <x:comment>Build properties</x:comment>
+  <property name="defaulttargetdir" value="$${basedir}/${defaulttargetdirRP}"/>
+  <property name="libdir" value="$${user.home}/.maven/repository" /> 
+  <property name="classesdir" value="$${basedir}/${classesdirRP}" />
 
   <j:if test="${unitTestSourcesPresent == 'true'}">
-    <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest" var="abstestclassesdir" />
-    <maven:makeRelativePath basedir="${baseDirFile}" path="${abstestclassesdir}" separator="/" var="testclassesdir"/>
-    <property name="testclassesdir" value="${testclassesdir}" />
-    
-    <maven:pluginVar plugin="maven-test-plugin" property="maven.test.reportsDirectory" var="abstestreportdir" />
-    <maven:makeRelativePath basedir="${baseDirFile}" path="${abstestreportdir}" separator="/" var="testreportdir"/>
-    <property name="testreportdir" value="${testreportdir}" />
+  <property name="testclassesdir" value="$${basedir}/${testclassesdirRP}" />  
+  <property name="testreportdir" value="$${basedir}/${testreportdirRP}" />
   </j:if>
 
-  <property name="distdir" value="dist"/>
-  <property name="javadocdir" value="dist/docs/api"/>
+  <property name="distdir" value="$${basedir}/dist"/>
+  <property name="javadocdir" value="$${basedir}/dist/docs/api"/>
   <property name="final.name" value="${maven.final.name}"/>
   
   <property name="proxy.host" value="$${maven.proxy.host}"/>
@@ -122,7 +116,7 @@
         deprecation="true"
         optimize="false">
         <src>
-          <pathelement location="${srcDir}"/>
+          <pathelement location="$${basedir}/${srcDirRP}"/>
         </src>
         <classpath refid="build.classpath" />
       </javac>
@@ -146,13 +140,13 @@
  
       <copy todir="${outputDir}">
         
-        <maven:makeRelativePath var="dir" basedir="${basedir}" path="${resource.directory}" separator="/"/>
+        <maven:makeRelativePath var="dirRP" basedir="${baseDirFile}" path="${resource.directory}" separator="/"/>
   
-        <j:if test="${empty dir}">
-          <j:set var="dir" value="."/>
+        <j:if test="${empty dirRP}">
+          <j:set var="dirRP" value="."/>
         </j:if>
         
-        <fileset dir="${dir}">
+        <fileset dir="$${basedir}/${dirRP}">
         
         <j:forEach var="res" items="${resource.includes}">
           <include name="${res}"/>
@@ -166,11 +160,10 @@
     </j:forEach>
     
     <!-- Copy license -->
-    <ant:echo>${maven.license.licenseFile}</ant:echo>
     <j:set var="licenseFile" value="${maven.license.licenseFile}"/>
     <j:if test="${licenseFile != null and not licenseFile.trim().equals('')}">
-      <maven:makeRelativePath var="licensePath" basedir="${basedir}" path="${maven.license.licenseFile}" separator="/"/>
-      <copy todir="$${classesdir}/META-INF" file="${licensePath}"/>
+    <maven:makeRelativePath var="licensePathRP" basedir="${baseDirFile}" path="${licenseFile}" separator="/"/>
+    <copy todir="$${classesdir}/META-INF" file="$${basedir}/${licensePathRP}"/>
     </j:if>
     
   </target>
@@ -224,7 +217,7 @@
              haltonerror="true"
              failureproperty="test.failure"
              fork="true"
-             dir="./">
+             dir="$${basedir}">
 
         <sysproperty key="basedir" value="."/>
         <formatter type="xml"/>
@@ -235,7 +228,7 @@
           <pathelement path="$${classesdir}"/>
         </classpath>
         <batchtest todir="$${testreportdir}">
-          <fileset dir="${testSrcDir}">
+          <fileset dir="$${basedir}/${testSrcDirRP}">
             <j:forEach var="pat" items="${pom.build.unitTest.includes}">
               <include name="${pat}"/>
             </j:forEach>
@@ -278,7 +271,7 @@
         deprecation="true"
         optimize="false">
         <src>
-          <pathelement location="${testSrcDir}"/>
+          <pathelement location="$${basedir}/${testSrcDirRP}"/>
         </src>
         <classpath>
           <path refid="build.classpath" />
@@ -313,7 +306,7 @@
             </j:otherwise>
           </j:choose>   
           <copy todir="${outputDir}">
-            <fileset dir="${testSrcDir}">
+            <fileset dir="$${basedir}/${testSrcDirRP}">
               <j:forEach var="res" items="${resource.includes}">
                 <include name="${res}"/>
               </j:forEach>
@@ -351,7 +344,7 @@
     />
  
     <javadoc
-      sourcepath="${srcDir}"
+      sourcepath="$${basedir}/${srcDirRP}"
       packagenames="${pom.package}.*"
       destdir="$${javadocdir}"
       author="true"
@@ -368,36 +361,66 @@
  
   </target>
 
+  <j:forEach var="lib" items="${pom.artifacts}">
+    <j:set var="dep" value="${lib.dependency}"/>
+    <maven:makeRelativePath var="depRP" basedir="${maven.repo.local}" path="${lib.path}" separator="/"/>
+    <u:file var="checkExist" name="${maven.repo.local}/${depRP}" />
+    <j:if test="${dependencies != null}">
+      <j:set var="dependencies" value="${dependencies},get-dep-${dep.artifactId}.jar"/>
+    </j:if>
+    <j:if test="${dependencies == null}">
+      <j:set var="dependencies" value="get-dep-${dep.artifactId}.jar"/>
+    </j:if>
+  <target
+    name="get-dep-${dep.artifactId}.jar"
+    depends="init,setProxy,noProxy,get-custom-dep-${dep.artifactId}.jar"
+    unless="${dep.artifactId}.jar"
+    description="o Download the dependency : ${dep.artifactId}.jar">
+    <mkdir dir="$${libdir}/${dep.artifactDirectory}/${dep.type}s/"/>
+    <j:choose>
+      <j:when test="${checkExist.exists()}">
+        <u:tokenize var="repos" delim=",">${maven.repo.remote}</u:tokenize>
+          <j:forEach var="repo" items="${repos}">
+            <!-- note: this is a valid use of artifactDirectory -->
+            <j:set var="url" value="${repo}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"/>
+            <get 
+              src="${url}"
+              dest="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"
+              usetimestamp="true"
+              ignoreerrors="true"
+            />
+            <j:set var="multiRepo" value="${maven.ant.use.multirepo}"/>
+            <j:if test="${not multiRepo}">
+              <j:break/>
+            </j:if>
+        </j:forEach>
+      </j:when>
+      <j:otherwise>
+        <x:comment>This dependency is overriden in maven project.</x:comment>
+        <maven:makeRelativePath var="depRP" basedir="${baseDirFile}" path="${lib.path}" separator="/"/>
+        <copy tofile="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}" file="$${basedir}/${depRP}"/>
+      </j:otherwise>
+    </j:choose>      
+  </target>
+  
+  <target
+    name="get-custom-dep-${dep.artifactId}.jar"
+    depends="init,setProxy,noProxy"
+    if="${dep.artifactId}.jar">
+    <mkdir dir="$${libdir}/${dep.artifactDirectory}/${dep.type}s/"/>
+    <get 
+      src="$${${dep.artifactId}.jar}"
+      dest="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"
+      usetimestamp="true"
+      ignoreerrors="true"
+    />
+  </target>
+  </j:forEach>
+
   <target
     name="get-deps"
-    depends="init,setProxy,noProxy"
-    unless="noget">
-  
-    <j:forEach var="lib" items="${pom.artifacts}">
-      <maven:makeRelativePath var="relativePath" basedir="${maven.repo.local}" path="${lib.path}" separator="/"/>
-      <u:file var="checkExist" name="${maven.repo.local}/${relativePath}" />
-      <j:set var="dep" value="${lib.dependency}"/>
-      <mkdir dir="$${libdir}/${dep.artifactDirectory}/${dep.type}s/"/>
-      <j:choose>
-        <j:when test="${checkExist.exists()}">
-          <!-- note: this is a valid use of artifactDirectory -->
-          <j:set var="url" value="${repo}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"/>
-          <property name="${dep.artifactId}.jar" value="${url}"/>
-          <j:set var="get.src" value="$${${dep.artifactId}.jar}"/>
-          <get 
-            src="${get.src}"
-            dest="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}"
-            usetimestamp="true"
-            ignoreerrors="true"
-          />
-        </j:when>
-        <j:otherwise>
-          <maven:makeRelativePath var="relativePath" basedir="${basedir}" path="${lib.path}" separator="/"/>
-          <copy tofile="$${libdir}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}" file="${relativePath}"/>
-        </j:otherwise>
-      </j:choose>      
-  </j:forEach>
-  </target>
+    depends="${dependencies}"
+    unless="noget"/>
 
   <target
     name="setProxy"
@@ -446,6 +469,9 @@
 
   <target
     name="install-maven">
+    <!-- get first repo in the list -->
+    <u:tokenize var="repos" delim=",">${maven.repo.remote}</u:tokenize>
+    <j:set var="repo">${repos[0]}</j:set>
 
     <!--
     
diff --git a/ant/src/plugin-test/LICENSE.txt b/ant/src/plugin-test/LICENSE.txt
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/ant/src/plugin-test/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 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/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml
index 1d2da971..eb1a7c26 100644
--- a/ant/src/plugin-test/maven.xml
+++ b/ant/src/plugin-test/maven.xml
@@ -32,15 +32,15 @@
     <j:set var="defaulttargetdirName" value="${properties[2].attribute('name').value}"/>
     <j:set var="defaulttargetdirValue" value="${properties[2].attribute('value').value}"/>
     <assert:assertEquals expected="defaulttargetdir" value="${defaulttargetdirName}" msg="first target is not defaulttargetdir"/>
-    <assert:assertEquals expected="target" value="${defaulttargetdirValue}" msg="defaulttargetdir property is not relative"/>
+    <assert:assertEquals expected="$${basedir}/target" value="${defaulttargetdirValue}" msg="defaulttargetdir property is not relative"/>
     <!-- check obey jar override -->
-    <x:set var="countJarsDownload" select="count($buildXml/project/target[@name = 'get-deps']/get)"/>
+    <x:set var="countJarsDownload" select="count($buildXml/project/target[starts-with(@name,'get-dep')]/get)"/>
     <assert:assertEquals expected="2" value="${countJarsDownload.intValue().toString()}" msg="Should only download JUnit and maven-jaxb-plugin jars"/>
-    <x:set var="countJarsCopy" select="count($buildXml/project/target[@name = 'get-deps']/copy)"/>
+    <x:set var="countJarsCopy" select="count($buildXml/project/target[starts-with(@name,'get-dep')]/copy)"/>
     <assert:assertEquals expected="1" value="${countJarsCopy.intValue().toString()}" msg="Should only copy the activation jar"/>
     <!-- check test filesets -->
     <x:set var="testFilesetDirs" select="$buildXml/project/target[@name = 'compile-tests']/copy/fileset/@dir"/>
-    <assert:assertEquals expected="src/test" value="${testFilesetDirs[0].value}" msg="test fileset dirs are not relative"/>
+    <assert:assertEquals expected="$${basedir}/src/test" value="${testFilesetDirs[0].value}" msg="test fileset dirs are not relative"/>
     <assert:assertFileExists file="${maven.build.dest}/directory-1/file1.properties"/>
     <assert:assertFileExists file="${maven.build.dest}/file2.properties"/>
     <!-- there are no unit test sources present, so the resources wont be copied either
diff --git a/ant/src/plugin-test/project.properties b/ant/src/plugin-test/project.properties
index c3c7193e..90563578 100644
--- a/ant/src/plugin-test/project.properties
+++ b/ant/src/plugin-test/project.properties
@@ -1,4 +1,6 @@
-maven.jar.override=on
-maven.jar.activation = ${basedir}/lib/activation-1.0.2.jar
+maven.jar.override        =on
+maven.jar.activation      =${basedir}/lib/activation-1.0.2.jar
 
-maven.license.licenseFile=${basedir}/../../../LICENSE.txt
\ No newline at end of file
+maven.license.licenseFile =${basedir}/LICENSE.txt
+
+maven.ant.use.multirepo   =false
\ No newline at end of file
diff --git a/ant/xdocs/ant-settings.xml b/ant/xdocs/ant-settings.xml
index eb1fd0db..1613d0fe 100644
--- a/ant/xdocs/ant-settings.xml
+++ b/ant/xdocs/ant-settings.xml
@@ -46,7 +46,7 @@
           </tr>
           <tr>
             <td>libdir</td>
-            <td>The directory where are downloaded dependencies (default maven local repository). If you prefer you can use something like <code>${defaulttargetdir}/lib</code>.</td>
+            <td>The directory where are downloaded dependencies (default maven local repository). If you prefer you can use something like <code>${basedir}/target/lib</code>.</td>
             <td>${user.home}/.maven/repository</td>
           </tr>
           <tr>
@@ -82,7 +82,7 @@
           <tr>
             <td>
               <i>${dep.artifactId}</i>.jar</td>
-            <td>A property is created for each project's dependency (for example : <code>activation.jar</code>). This property can be used to override the default url used to download the dependency (for example : <code>activation.jar=http://myhost/repository/sun/jars/activation-1.0.2.jar</code>)</td>
+            <td>A property is created for each project's dependency (for example : <code>activation.jar</code>). This property can be used to override the default url used to download the dependency (for example : <code>activation.jar=http://myhost/repository/sun/jars/activation-1.0.2.jar</code>).</td>
             <td/>
           </tr>
           <tr>
diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml
index edbbbbe2..b88b0a52 100644
--- a/ant/xdocs/changes.xml
+++ b/ant/xdocs/changes.xml
@@ -24,9 +24,10 @@
   </properties>
   <body>
     <release version="1.9" date="In SVN">
+      <action dev="aheritier" type="add" issue="MPANT-24">Ant script looks for dependencies in several remote repositories.</action>
       <action dev="aheritier" type="add" issue="MPANT-23" due-to="Phil Steitz">Add License file to jar META-INF.</action>
       <action dev="aheritier" type="update" issue="MPANT-21">"get-deps" target store downloads to the default local maven repository (<i>${user.home}/.maven/repository</i>).</action>
-      <action dev="aheritier" type="add" issue="MPANT-20" due-to="Dennis Lundberg">Allow URL substitutions in generated build.xml files.</action>
+      <action dev="aheritier" type="add" issue="MPANT-20" due-to="Dennis Lundberg,Craig McClanahan">Allow URL substitutions in generated build.xml files.</action>
       <action dev="epugh" type="add" issue="MPANT-7">Obey jar override and not attempt to download relative jars.</action>
       <action dev="aheritier" type="add">Ant user can set proxy settings.</action>
       <action dev="aheritier" type="add">New property maven.ant.compatibility if you want a script compatible with ant 1.5 (actually for proxy settings).</action>
diff --git a/ant/xdocs/properties.xml b/ant/xdocs/properties.xml
index 948ca4a9..1c04e0dd 100644
--- a/ant/xdocs/properties.xml
+++ b/ant/xdocs/properties.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <section name="Maven Ant Plugin Settings">
+      <p>These settings allow you to customize the ant script generated with this plugin.</p>
       <table>
         <tr>
           <th>Property name</th>
@@ -63,6 +64,13 @@
           <td>Yes</td>
           <td>true</td>
         </tr>
+        <tr>
+          <td>maven.ant.use.multirepo</td>
+          <td>Defines if you want to generate a script which will download dependencies from all your repositories. If false, the script will only download them from the first one (ibiblio by default).</td>
+          <td>since 1.9</td>
+          <td>Yes</td>
+          <td>true</td>
+        </tr>
       </table>
     </section>
   </body>