diff --git a/ant/plugin.jelly b/ant/plugin.jelly
index b5c9a2c3..9e2c1011 100644
--- a/ant/plugin.jelly
+++ b/ant/plugin.jelly
@@ -17,9 +17,11 @@
  */
  -->
 
-
+<!-- Note the need to declare "test" as a namespace because it is used in the template -->
 <project 
   xmlns:ant="jelly:ant"
+  xmlns:maven="jelly:maven"
+  xmlns:test="test"
   xmlns:j="jelly:core">
   <!-- ================================================================== -->
   <!-- A N T  B U I L D  G E N E R A T O R                                -->
diff --git a/ant/project.xml b/ant/project.xml
index aa010855..919f9463 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -63,9 +63,6 @@
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
       <version>20030211.142705</version>
-      <properties>
-        <classloader>root.maven</classloader>
-      </properties>
     </dependency>
   </dependencies>
 </project>
diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index 4f592036..8eb63da5 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -21,6 +21,7 @@
   xmlns:u="jelly:util"
   xmlns:x="jelly:xml"
   xmlns:maven="jelly:maven"
+  xmlns:test="test"
   xmlns="dummy">
 
   <ant:tstamp />
@@ -34,7 +35,6 @@
     <maven:makeRelativePath var="testSrcDir" basedir="${basedir}" path="${pom.build.unitTestSourceDirectory}" separator="/"/>
   </j:if>
 
-
   <x:comment>
   build.xml generated by maven from project.xml version ${pom.currentVersion}
   on date ${TODAY}, time ${TSTAMP}
@@ -42,13 +42,15 @@
 
 <project name="${pom.artifactId}" default="jar" basedir=".">
   
-  <property name="defaulttargetdir" value="target"/> 
-  <property name="libdir" value="target/lib" />
-  <property name="classesdir" value="target/classes"/>
+  <property name="defaulttargetdir" value="${maven.build.dir}"/> 
+  <property name="libdir" value="${maven.build.dir}/lib" />
+  <property name="classesdir" value="${maven.build.dest}" />
 
   <j:if test="${unitTestSourcesPresent == 'true'}">
-    <property name="testclassesdir" value="target/test-classes"/>
-    <property name="testreportdir" value="target/test-reports"/>
+    <maven:pluginVar plugin="maven-test-plugin" property="maven.test.dest" var="testclassesdir" />
+    <property name="testclassesdir" value="${testclassesdir}" />
+    <maven:pluginVar plugin="maven-test-plugin" property="maven.test.reportDirectory" var="testreportdir" />
+    <property name="testreportdir" value="${testreportdir}" />
   </j:if>
 
   <property name="distdir" value="dist"/>
@@ -146,7 +148,7 @@
     description="o Create the jar">
 
     <jar
-      jarfile="target/$${final.name}.jar"
+      jarfile="$${defaulttargetdir}/$${final.name}.jar"
       basedir="$${classesdir}"
       excludes="**/package.html"
     />
@@ -305,7 +307,7 @@
         <fileset dir="$${libdir}">
           <include name="*.jar"/>
         </fileset>
-        <pathelement location="target/$${final.name}.jar"/>
+        <pathelement location="$${defaulttargetdir}/$${final.name}.jar"/>
       </classpath>
     </javadoc>
  
diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml
index ed6694aa..4166312a 100644
--- a/ant/xdocs/changes.xml
+++ b/ant/xdocs/changes.xml
@@ -26,6 +26,7 @@
   <body>
     <release version="1.7" date="in CVS">
       <action dev="dion" type="fix" issue="MPANT-11">Change plugin tests to use 'assert' tags</action>
+      <action dev="brett" type="fix">Replace use of 'target' directory with appropriate variables</action>
     </release>
     
     <release version="1.6" date="2004-03-07">
