diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index 091f85a2..51ce036d 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -10,19 +10,6 @@
   <!-- D I S T R I B U T I O N S                                          -->
   <!-- ================================================================== -->
 
-  <ant:property name="maven.dist.assembly.dir"
-    value="${maven.build.dir}/${maven.final.name}"/>
-  <ant:property name="maven.dist.bin.archive.dir"
-    value="${maven.dist.assembly.dir}/bin"/>
-  <ant:property name="maven.dist.src.archive.dir"
-    value="${maven.dist.assembly.dir}/src"/>
-  <ant:property name="maven.dist.bin.assembly.dir"
-    value="${maven.dist.assembly.dir}/bin/${maven.final.name}"/>
-  <ant:property name="maven.dist.src.assembly.dir"
-    value="${maven.dist.assembly.dir}/src/${maven.final.name}"/>
-  <ant:property name="maven.dist.dir"
-    value="${maven.build.dir}/distributions"/>
-
   <goal
     name="dist:prepare-bin-filesystem"
     prereqs="xdoc:init, jar:jar, javadoc:generate"
@@ -102,7 +89,7 @@
       <j:otherwise>
         <attainGoal name="ant:generate-build"/>
         <ant:move 
-          file="build.xml"
+          file="${basedir}/build.xml"
           tofile="${maven.dist.src.assembly.dir}/build.xml"/>
       </j:otherwise>
     </j:choose>
diff --git a/dist/plugin.properties b/dist/plugin.properties
index 585630d7..5c2ef084 100644
--- a/dist/plugin.properties
+++ b/dist/plugin.properties
@@ -4,3 +4,9 @@
 # Distribution plugin.
 # -------------------------------------------------------------------
 
+maven.dist.assembly.dir=${maven.build.dir}/${maven.final.name}
+maven.dist.bin.archive.dir=${maven.dist.assembly.dir}/bin
+maven.dist.src.archive.dir=${maven.dist.assembly.dir}/src
+maven.dist.bin.assembly.dir=${maven.dist.assembly.dir}/bin/${maven.final.name}
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}
+maven.dist.dir=${maven.build.dir}/distributions