Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/build.xml	(revision 5153)
@@ -21,30 +21,42 @@
   </target>
 
-  <target name="build" depends="compile">
+  <target name="build" depends="dist">
+  </target>
+
+  <target name="dist" depends="compile">
+    <mkdir dir="dist"/>
     <ant	dir="colorscheme"	antfile="build.xml"	target="dist"/>
-    <ant	dir="lang"		antfile="build.xml"	target="install-all"/>
-    <ant	dir="mappaint"		antfile="build.xml"	target="build"/>
+    <ant	dir="duplicateway"	antfile="build.xml"	target="dist"/>
+    <ant	dir="lang"		antfile="build.xml"	target="dist"/>
+    <ant	dir="mappaint"		antfile="build.xml"	target="dist"/>
     <ant	dir="namefinder"	antfile="build.xml"	target="dist"/>
-    <ant	dir="nearclick"		antfile="build.xml"	target="build"/>
-    <ant	dir="osmarender"	antfile="build.xml"	target="build"/>
-    <ant	dir="plastic_laf"	antfile="build.xml"	target="build"/>
+    <ant	dir="nearclick"		antfile="build.xml"	target="dist"/>
+    <ant	dir="openvisible"	antfile="build.xml"	target="dist"/>
+    <ant	dir="osmarender"	antfile="build.xml"	target="dist"/>
+    <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/>
     <ant	dir="slippymap"		antfile="build.xml"	target="dist"/>
-    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="build"/>
-    <ant	dir="validator"		antfile="build.xml"	target="build"/>
-    <ant	dir="wmsplugin"		antfile="build.xml"	target="build"/>
-    <ant	dir="ywms"		antfile="build.xml"	target="build"/>
+    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/>
+    <ant	dir="utilsplugin"	antfile="build.xml"	target="dist"/>
+    <ant	dir="validator"		antfile="build.xml"	target="dist"/>
+    <ant	dir="wmsplugin"		antfile="build.xml"	target="dist"/>
+    <ant	dir="ywms"		antfile="build.xml"	target="dist"/>
 
     <ant	dir="livegps"		antfile="build.xml"	target="dist"/>
     <ant	dir="surveyor"		antfile="build.xml"	target="dist"/>
-    <!--ant	dir="grid"		antfile="build.xml"	target="build"/-->
-    <!-- ant	dir="pluginmanager"	antfile="build.xml"	target="dist"/ --> 
-    <!-- ant	dir="tways"		antfile="build.xml"	target="build"/ --> 
-    <!-- ant	dir="waypoints"		antfile="build.xml"	target="build"/ -->
-    <!-- ant	dir="navigator"		antfile="build.xml"	target="dist"/ -->
+  </target>
+
+  <target name="build_defect" depends="compile">
+    <ant	dir="lakewalker"	antfile="build.xml"	target="dist"/>
+    <ant	dir="navigator"		antfile="build.xml"	target="dist"/>
+    <ant	dir="pluginmanager"	antfile="build.xml"	target="dist"/> 
+    <ant	dir="waypoints"		antfile="build.xml"	target="dist"/>
+    <ant	dir="grid"		antfile="build.xml"	target="dist"/>
   </target>
 
   <target name="clean">
     <ant	dir="colorscheme"	antfile="build.xml"	target="clean"/>
+    <ant	dir="duplicateway"	antfile="build.xml"	target="clean"/>
     <ant	dir="grid"		antfile="build.xml"	target="clean"/>
+    <ant	dir="lakewalker"	antfile="build.xml"	target="clean"/>
     <ant	dir="lang"		antfile="build.xml"	target="clean"/>
     <ant	dir="mappaint"		antfile="build.xml"	target="clean"/>
@@ -52,9 +64,11 @@
     <ant	dir="navigator"		antfile="build.xml"	target="clean"/>
     <ant	dir="nearclick"		antfile="build.xml"	target="clean"/>
+    <ant	dir="openvisible"	antfile="build.xml"	target="clean"/>
     <ant	dir="osmarender"	antfile="build.xml"	target="clean"/>
     <ant	dir="plastic_laf"	antfile="build.xml"	target="clean"/>
     <ant	dir="pluginmanager"	antfile="build.xml"	target="clean"/>
+    <ant	dir="slippymap"		antfile="build.xml"	target="clean"/>
     <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="clean"/>
-    <ant	dir="tways"		antfile="build.xml"	target="clean"/>
+    <ant	dir="utilsplugin"	antfile="build.xml"	target="clean"/>
     <ant	dir="validator"		antfile="build.xml"	target="clean"/>
     <ant	dir="waypoints"		antfile="build.xml"	target="clean"/>
@@ -64,4 +78,6 @@
     <ant	dir="surveyor"		antfile="build.xml"	target="clean"/>
     <ant	dir="livegps"		antfile="build.xml"	target="clean"/>
+
+    <delete dir="dist" />
   </target>
 
@@ -69,5 +85,5 @@
   </target>
 
-  <target name="install" depends="build">
+  <target name="install" depends="dist">
   </target>
 
Index: /applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- /applications/editors/josm/plugins/colorscheme/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/colorscheme/build.xml	(revision 5153)
@@ -2,9 +2,11 @@
 
   <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
@@ -65,7 +67,7 @@
 
   <target name="clean">
+    <delete dir="${plugin.site.file}" />
     <delete dir="${plugin.build.dir}" />
-    <delete dir="${plugin.site.file}" />
-    <delete dir="${plugin.jar}" />
+    <delete file="${plugin.jar}" />
   </target>
 
Index: /applications/editors/josm/plugins/duplicateway/build.xml
===================================================================
--- /applications/editors/josm/plugins/duplicateway/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/duplicateway/build.xml	(revision 5153)
@@ -1,15 +1,27 @@
-<project name="Duplicate-Way" default="jar" basedir=".">
+<project name="Duplicate-Way" default="dist" basedir=".">
 
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
+  <target name="init">
+    <mkdir dir="${plugin.build.dir}"/>
+  </target>
 
-  <target name="compile" depends="clean">
+
+  <target name="compile" depends="init">
     <mkdir dir="build"></mkdir>
-    <mkdir dir="build/images"></mkdir>
+    <mkdir dir="${plugin.build.dir}/images"></mkdir>
     <copy todir="build">
-      <fileset dir="bin" casesensitive="yes">
+      <fileset dir="${plugin.build.dir}" casesensitive="yes">
     	<filename name="**/*.class"/>
       </fileset>
     </copy>
-    <copy todir="build/images">
+    <copy todir="${plugin.build.dir}/images">
       <fileset dir="images" casesensitive="yes">
     	<filename name="**/*.png"/>
@@ -18,6 +30,6 @@
   </target>
 
-  <target name="jar" depends="compile">
-    <jar destfile="Duplicate-Way.jar" basedir="build">
+  <target name="dist" depends="compile">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
         <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.duplicateway.DuplicateWayPlugin" />
@@ -30,10 +42,10 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete file="Duplicate-Way.jar" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="jar">
-    <copy file="Duplicate-Way.jar" todir="${user.home}/.josm/plugins"/>
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
   </target>
 
Index: /applications/editors/josm/plugins/grid/build.xml
===================================================================
--- /applications/editors/josm/plugins/grid/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/grid/build.xml	(revision 5153)
@@ -1,10 +1,13 @@
-<project name="grid" default="build" basedir=".">
+<project name="grid" default="dist" basedir=".">
 
   <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
   
   <!-- point to your JOSM directory -->
@@ -24,5 +27,5 @@
   </target>
 
-  <target name="build" depends="compile">
+  <target name="dist" depends="compile">
     <copy todir="build/images" >
       <fileset dir="images" />
@@ -37,10 +40,9 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
-    <delete dir="${plugin.jar}" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="build">
+  <target name="install" depends="dist">
     <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
   </target>
Index: /applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- /applications/editors/josm/plugins/lakewalker/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/lakewalker/build.xml	(revision 5153)
@@ -1,11 +1,24 @@
-<project name="Lakewalker" default="jar" basedir=".">
+<project name="Lakewalker" default="dist" basedir=".">
 
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
   <property name="josm" location="../../core/dist/josm-custom.jar" />
 
-  <target name="compile" depends="clean">
+  <target name="init">
+    <mkdir dir="${plugin.build.dir}"/>
+  </target>
+
+  <target name="compile" depends="init">
     <mkdir dir="build"></mkdir>
     <mkdir dir="build/images"></mkdir>
     <copy todir="build">
-      <fileset dir="bin" casesensitive="yes">
+      <fileset dir="${plugin.build.dir}" casesensitive="yes">
     	<filename name="**/*.class"/>
       </fileset>
@@ -18,6 +31,6 @@
   </target>
 
-  <target name="jar" depends="compile">
-    <jar destfile="Lakewalker.jar" basedir="build">
+  <target name="dist" depends="compile">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
         <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.lakewalker.LakewalkerPlugin" />
@@ -30,10 +43,10 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete file="Lakewalker.jar" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="jar">
-    <copy file="Lakewalker.jar" todir="${user.home}/Application Data/JOSM/plugins"/>
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${user.home}/Application Data/JOSM/plugins"/>
     <copy todir="${user.home}/Application Data/JOSM/plugins/Lakewalker">
       <fileset dir="Lakewalker">
Index: /applications/editors/josm/plugins/lang/build.xml
===================================================================
--- /applications/editors/josm/plugins/lang/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/lang/build.xml	(revision 5153)
@@ -1,13 +1,17 @@
 <project name="lang" default="install-all" basedir=".">
 
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
 
-  <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
-  <property name="plugins" value=".."/>
-
+  <target name="dist" depends="install-all">
+  </target>
+  
   <target name="install-all" depends="josm-build,keys.pot">
     <ant target="install"><property name="language" value="de"/></ant>
@@ -18,7 +22,7 @@
 
   <target name="install">
-    <mkdir dir="${language}/bin"/>
-    <mkdir dir="dist"/>
-    <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/bin" />
+    <mkdir dir="${language}/build"/>
+    <mkdir dir="../dist"/>
+    <javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/build" />
 
     <exec executable="msgmerge">
@@ -27,10 +31,10 @@
 
     <exec executable="msgfmt">
-      <arg line="--java2 -d${language}/bin -rorg.openstreetmap.josm.Translation -l${language} ${language}/${language}.po"/>
+      <arg line="--java2 -d${language}/build -rorg.openstreetmap.josm.Translation -l${language} ${language}/${language}.po"/>
     </exec>
 
-    <copy file="i18n.properties" todir="${language}/bin/org/openstreetmap/josm" />
+    <copy file="i18n.properties" todir="${language}/build/org/openstreetmap/josm" />
 
-    <jar destfile="dist/lang-${language}.jar" basedir="${language}/bin">
+    <jar destfile="../dist/lang-${language}.jar" basedir="${language}/build">
       <manifest>
 	<attribute name="Plugin-Class" value="org.openstreetmap.josm.TranslationLoader_${language}" />
@@ -58,7 +62,14 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
-    <delete dir="${plugin.jar}" />
+    <ant target="clean_lang"><property name="language" value="de"/></ant>
+    <ant target="clean_lang"><property name="language" value="fr"/></ant>
+    <ant target="clean_lang"><property name="language" value="ro"/></ant>
+    <ant target="clean_lang"><property name="language" value="en_GB"/></ant>
+    <delete dir="${plugin.build.dir}" />
+  </target>
+
+  <target name="clean_lang">
+    <delete file="../dist/lang-${language}.jar" />
+    <delete dir="${language}/build"/>
   </target>
 
Index: /applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- /applications/editors/josm/plugins/livegps/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/livegps/build.xml	(revision 5153)
@@ -1,9 +1,14 @@
 <project name="livegps" default="dist" basedir=".">
+
   <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="build"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
+  <property name="plugin.jar" value="../dist/${plugin.name}.jar"/>
   <property name="livegpsplugin.jar" value="${josm.home.dir}/plugins/livegps.jar"/>
   
@@ -47,5 +52,5 @@
           <include name="**/*.jar"/>
         </fileset>
-        <pathelement location="${livegpsplugin.jar}"/>
+        <pathelement location="${plugin.jar}"/>
       </classpath>
     </javac>
@@ -63,5 +68,5 @@
     <delete dir="${plugin.build.dir}" />
     <delete dir="${plugin.site.file}" />
-    <delete dir="${plugin.jar}" />
+    <delete file="${plugin.jar}" />
   </target>
 
Index: /applications/editors/josm/plugins/mappaint/build.xml
===================================================================
--- /applications/editors/josm/plugins/mappaint/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/mappaint/build.xml	(revision 5153)
@@ -1,4 +1,13 @@
-<project name="mappaint" default="build" basedir=".">
+<project name="mappaint" default="dist" basedir=".">
 
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
   <!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
   <property name="josm" location="../../core/dist/josm-custom.jar" />
@@ -25,5 +34,5 @@
   </target>
 
-  <target name="build" depends="compile">
+  <target name="dist" depends="compile">
     <copy todir="build/standard">
       <fileset dir="styles/standard"></fileset>
@@ -37,5 +46,5 @@
     <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     <delete file="REVISION"/>
-    <jar destfile="dist/mappaint.jar" basedir="build">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
 	<attribute name="Plugin-Class" value="mappaint.MapPaintPlugin" />
@@ -49,6 +58,6 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
@@ -57,6 +66,6 @@
   </target>
 
-  <target name="install" depends="build">
-    <copy file="dist/mappaint.jar" todir="${plugins}"/>
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${plugins}"/>
   </target>
 
Index: /applications/editors/josm/plugins/namefinder/build.xml
===================================================================
--- /applications/editors/josm/plugins/namefinder/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/namefinder/build.xml	(revision 5153)
@@ -1,17 +1,22 @@
 <project name="namefinder" default="dist" basedir=".">
-  <property name="josm.prj.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="build"/>
 
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
   <!-- init target -->
   <target name="init">
-    <mkdir dir="build" />
-    <mkdir dir="dist" />
+    <mkdir dir="${plugin.build.dir}" />
   </target>
-
+  
   <!-- clean target -->
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
   
@@ -20,7 +25,7 @@
     <javac srcdir="namefinder" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
       <classpath>
-        <pathelement path="${josm.prj.dir}/build"/>
-        <pathelement path="${josm.prj.dir}/src"/>
-        <fileset dir="${josm.prj.dir}/lib">
+        <pathelement path="${josm.build.dir}/build"/>
+        <pathelement path="${josm.build.dir}/src"/>
+        <fileset dir="${josm.build.dir}/lib">
           <include name="**/*.jar"/>
         </fileset>
@@ -28,8 +33,8 @@
     </javac>
   </target>
-
+  
   <!-- dist target - create jar file -->
   <target name="dist" depends="compile">
-    <jar destfile="dist/${ant.project.name}.jar" basedir="${plugin.build.dir}">
+    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
       <manifest>
         <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" />
@@ -39,9 +44,10 @@
     </jar>
   </target>
-
-  <!-- dist target - copy jar file to plugin destination -->
+  
+  <!-- install target - copy jar file to plugin destination -->
   <target name="install" depends="dist">
-    <copy file="dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
+    <copy file="../dist/${ant.project.name}.jar" todir="${josm.home.dir}/plugins" />
   </target>
   
 </project>
+
Index: /applications/editors/josm/plugins/navigator/build.xml
===================================================================
--- /applications/editors/josm/plugins/navigator/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/navigator/build.xml	(revision 5153)
@@ -2,9 +2,11 @@
 
   <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
Index: /applications/editors/josm/plugins/nearclick/build.xml
===================================================================
--- /applications/editors/josm/plugins/nearclick/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/nearclick/build.xml	(revision 5153)
@@ -1,3 +1,12 @@
-<project name="nearclick" default="build" basedir=".">
+<project name="nearclick" default="dist" basedir=".">
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
   <!-- There's no josm.jar in the svn, so point "josm" to a local copy of your JOSM binary -->
@@ -25,6 +34,6 @@
   </target>
 
-  <target name="build" depends="compile">
-    <jar destfile="dist/nearclick.jar" basedir="build">
+  <target name="dist" depends="compile">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
 	<attribute name="Plugin-Class" value="nearclick.NearClickPlugin" />
@@ -35,14 +44,14 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
-
+  
   <target name="clean_install">
     <delete file="${plugins}/nearclick.jar" />
   </target>
 
-  <target name="install" depends="build">
-    <copy file="dist/nearclick.jar" todir="${plugins}"/>
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${plugins}"/>
   </target>
 
Index: /applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- /applications/editors/josm/plugins/openvisible/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/openvisible/build.xml	(revision 5153)
@@ -4,8 +4,8 @@
   <property name="josm.build.dir" value="../../core"/>
   <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.dist.dir" value="dist"/>
+  <property name="plugin.build.dir" value="build"/>
+  <property name="plugin.dist.dir" value="../dist"/>
   <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
+  <property name="plugin.jar" value="../dist/${plugin.name}.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
@@ -81,10 +81,4 @@
   </target>
 
-  <target name="clean">
-    <delete dir="${plugin.build.dir}" />
-    <delete dir="${plugin.site.file}" />
-    <delete dir="${plugin.jar}" />
-  </target>
-
   <!-- write site description for the given plugin so josm will accept it -->
   <target name="site">
@@ -138,3 +132,9 @@
 </target>
 
+<target name="clean">
+  <delete dir="${plugin.build.dir}" />
+  <delete dir="${plugin.site.file}" />
+  <delete file="${plugin.jar}" />
+</target>
+
 </project>
Index: /applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- /applications/editors/josm/plugins/osmarender/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/osmarender/build.xml	(revision 5153)
@@ -1,3 +1,12 @@
 <project name="osmarender" default="install" basedir=".">
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
   <property name="josm" location="../../core/dist/josm-custom.jar" />
@@ -5,16 +14,16 @@
 
   <target name="compile">
-    <mkdir dir="bin"></mkdir>
-    <mkdir dir="dist"></mkdir>
-    <javac srcdir="src" debug="true" classpath="${josm}" destdir="bin">
+    <mkdir dir="${plugin.build.dir}"></mkdir>
+    <mkdir dir="${plugin.dist.dir}"></mkdir>
+    <javac srcdir="src" debug="true" classpath="${josm}" destdir="${plugin.build.dir}">
       <include name="**/*.java" />
     </javac>
   </target>
 
-  <target name="build"  depends="compile">
-    <copy todir="bin" file="${rendering}/osmarender6/osmarender.xsl"/>
-    <copy tofile="bin/osm-map-features.xml"
+  <target name="dist"  depends="compile">
+    <copy todir="${plugin.build.dir}" file="${rendering}/osmarender6/osmarender.xsl"/>
+    <copy tofile="${plugin.build.dir}/osm-map-features.xml"
 	  file="${rendering}/osmarender5/osm-map-features-z17.xml"/>
-    <jar destfile="dist/osmarender.jar" basedir="bin">
+    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
       <manifest>
 	<attribute name="Plugin-Class" value="OsmarenderPlugin" />
@@ -25,9 +34,9 @@
 
   <target name="clean">
-    <delete dir="bin" />
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="compile,build" />
+  <target name="install" depends="compile,dist" />
 
 </project>
Index: /applications/editors/josm/plugins/plastic_laf/build.xml
===================================================================
--- /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/plastic_laf/build.xml	(revision 5153)
@@ -1,11 +1,20 @@
-<project name="plastic_laf" default="build" basedir=".">
+<project name="plastic_laf" default="dist" basedir=".">
 
-  <target name="build">
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+
+  <target name="dist">
     <mkdir dir="dist"></mkdir>
-    <unjar dest="bin" src="lib/looks-2.0.4.jar" />
-    <javac srcdir="src" destdir="bin">
+    <unjar dest="${plugin.build.dir}" src="lib/looks-2.0.4.jar" />
+    <javac srcdir="src" destdir="${plugin.build.dir}">
       <include name="**/*.java" />
     </javac>
-    <jar destfile="dist/plastic_laf.jar" basedir="bin">
+    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
       <manifest>
 	<attribute name="Plugin-Class" value="plastic_laf.Plugin" />
@@ -17,5 +26,6 @@
 
   <target name="clean">
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
Index: /applications/editors/josm/plugins/pluginmanager/build.xml
===================================================================
--- /applications/editors/josm/plugins/pluginmanager/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/pluginmanager/build.xml	(revision 5153)
@@ -1,3 +1,12 @@
 <project name="pluginmanager" default="dist" basedir=".">
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
   <!-- compilation properties -->
@@ -68,5 +77,5 @@
     <delete dir="${plugin.build.dir}" />
     <delete dir="${plugin.site.file}" />
-    <delete dir="${plugin.jar}" />
+    <delete file="${plugin.jar}" />
   </target>
 
Index: /applications/editors/josm/plugins/slippymap/build.xml
===================================================================
--- /applications/editors/josm/plugins/slippymap/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/slippymap/build.xml	(revision 5153)
@@ -1,3 +1,14 @@
 <project name="slippymap" default="dist" basedir=".">
+
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+  
 
   <target name="dist" depends="compile">
@@ -6,7 +17,7 @@
       <fileset dir="images" />
     </copy>
-
+    
     <!-- create josm-custom.jar -->
-    <jar destfile="slippymap.jar" basedir="build">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
         <attribute name="Plugin-Class" value="slippymap.SlippyMapPlugin" />
@@ -19,12 +30,13 @@
     <javac srcdir="slippymap" classpath="../../core/dist/josm-custom.jar" destdir="build" />
   </target>
-
+  
   <target name="init">
-    <mkdir dir="build" />
+    <mkdir dir="${plugin.build.dir}" />
   </target>
-
+  
   <target name="clean">
-    <delete dir="build" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
-
+  
 </project>
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 5153)
@@ -1,11 +1,14 @@
 <project name="surveyor" default="dist" basedir=".">
+  
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
-  <!-- compilation properties -->
-  <property name="josm.build.dir" value="../../core"/>
-  <property name="josm.home.dir" value="${user.home}/.josm"/>
-  <property name="plugin.build.dir" value="bin"/>
-  <property name="plugin.name" value="${ant.project.name}"/>
-  <property name="plugin.jar" value="${plugin.name}.jar"/>
-  <property name="livegpsplugin.jar" value="../livegps/livegps.jar"/>
+  <property name="livegpsplugin.jar" value="../dist/livegps.jar"/>
   
   <!-- plugin meta data (enter new version number if anything changed!) -->
@@ -21,5 +24,5 @@
   <property name="plugin.site.upload.target" value="cdaller@www.tegmento.org:public_html/josm/surveyor/"/>
   
-
+  
   <target name="dist" depends="compile,site">
     <!-- images -->
@@ -51,9 +54,9 @@
 	  <include name="**/*.jar"/>
 	</fileset>
-        <pathelement location="${livegpsplugin.jar}"/>
+	<pathelement location="${livegpsplugin.jar}"/>
       </classpath>
     </javac>
   </target>
-
+  
   <target name="install" depends="dist">
     <copy file="${plugin.jar}" todir="${josm.home.dir}/plugins" />
@@ -67,5 +70,5 @@
     <delete dir="${plugin.build.dir}" />
     <delete dir="${plugin.site.file}" />
-    <delete dir="${plugin.jar}" />
+    <delete file="${plugin.jar}" />
   </target>
 
Index: /applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 5153)
@@ -1,22 +1,31 @@
-<project name="tagging-preset-tester" default="build" basedir=".">
+<project name="tagging-preset-tester" default="dist" basedir=".">
 
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar" />
-	</target>
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
-	<target name="build" depends="compile">
-	  <mkdir dir="dist"/>
-	  <jar destfile="dist/tagging-preset-tester.jar" 
-	       basedir="build"
-	       manifest="src/org/openstreetmap/josm/plugins/taggingpresettester/MANIFEST.MF">
-	    <fileset dir="."><include name="images/*"/></fileset>
-	  </jar>
-	</target>
+  <target name="compile">
+    <mkdir dir="build"/>
+    <javac srcdir="src" destdir="build" classpath="../../core/dist/josm-custom.jar" />
+  </target>
 
-	<target name="clean">
-	  <delete dir="dist"/>
-	  <delete dir="build"/>
-	</target>
+  <target name="dist" depends="compile">
+    <mkdir dir="dist"/>
+    <jar destfile="${plugin.jar}" 
+	 basedir="build"
+	 manifest="src/org/openstreetmap/josm/plugins/taggingpresettester/MANIFEST.MF">
+      <fileset dir="."><include name="images/*"/></fileset>
+    </jar>
+  </target>
+  
+  <target name="clean">
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
+  </target>
 
 </project>
Index: /applications/editors/josm/plugins/utilsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/utilsplugin/build.xml	(revision 5153)
@@ -1,5 +1,13 @@
-<project name="utilsplugin" default="build" basedir=".">
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-  
+<project name="utilsplugin" default="dist" basedir=".">
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
+
   <target name="init">
     <mkdir dir="build"/>
@@ -10,9 +18,9 @@
   </target>
 
-  <target name="build" depends="clean, compile">
+  <target name="dist" depends="clean, compile">
     <copy todir="build/images">
       <fileset dir="images"/>
     </copy>
-    <jar destfile="utilsplugin.jar" basedir="build">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
 	<attribute name="Plugin-Class" value="UtilsPlugin.UtilsPlugin"/>
@@ -26,9 +34,10 @@
 
   <target name="clean">
-    <delete dir="build" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="build">
-    <copy file="utilsplugin.jar" todir="${user.home}/.josm/plugins"/>
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
   </target>
 </project>
Index: /applications/editors/josm/plugins/validator/build.xml
===================================================================
--- /applications/editors/josm/plugins/validator/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/validator/build.xml	(revision 5153)
@@ -1,3 +1,12 @@
-<project name="validator" default="build" basedir=".">
+<project name="validator" default="dist" basedir=".">
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
   <!-- point to your JOSM directory -->
@@ -7,5 +16,5 @@
   
   <target name="init">
-    <mkdir dir="build"/>
+    <mkdir dir="${plugin.build.dir}"/>
   </target>
 
@@ -16,5 +25,5 @@
   </target>
 
-  <target name="build" depends="clean, compile">
+  <target name="dist" depends="clean, compile">
     <copy todir="build/images">
       <fileset dir="images"/>
@@ -28,5 +37,5 @@
     <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     <delete file="REVISION"/>
-    <jar destfile="validator.jar" basedir="build">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
 	<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
@@ -39,10 +48,12 @@
   </target>
 
+  <!-- clean target -->
   <target name="clean">
-    <delete dir="build" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="build">
-    <copy file="validator.jar" todir="${user.home}/.josm/plugins"/>
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
   </target>
 
@@ -51,3 +62,4 @@
     </java>
   </target>
+
 </project>
Index: /applications/editors/josm/plugins/waypoints/build.xml
===================================================================
--- /applications/editors/josm/plugins/waypoints/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/waypoints/build.xml	(revision 5153)
@@ -1,3 +1,12 @@
-<project name="waypoints" default="build" basedir=".">
+<project name="waypoints" default="dist" basedir=".">
+
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
   <!-- point to your JOSM directory -->
@@ -17,5 +26,5 @@
   </target>
 
-  <target name="build" depends="compile">
+  <target name="dist" depends="compile">
     <!--
 	<copy todir="build/images">
@@ -31,10 +40,11 @@
   </target>
 
+  <!-- clean target -->
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
 
-  <target name="install" depends="build">
+  <target name="install" depends="dist">
     <copy file="dist/waypoints.jar" todir="${user.home}/.josm/plugins"/>
   </target>
Index: /applications/editors/josm/plugins/wmsplugin/build.xml
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/wmsplugin/build.xml	(revision 5153)
@@ -1,8 +1,12 @@
-<project name="wmsplugin" default="build" basedir=".">
+<project name="wmsplugin" default="dist" basedir=".">
 
-  <!-- point to your JOSM directory -->
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-
-
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
 
   <target name="init">
@@ -17,9 +21,9 @@
   </target>
 
-  <target name="build" depends="compile">
+  <target name="dist" depends="compile">
     <copy todir="build/images" >
       <fileset dir="images" />
     </copy>
-    <jar destfile="dist/wmsplugin.jar" basedir="build">
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
 	<attribute name="Plugin-Class" value="wmsplugin.WMSPlugin" />
@@ -31,11 +35,11 @@
 
   <target name="clean">
-    <delete dir="build" />
-    <delete dir="dist" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
-
-  <target name="install" depends="build">
-    <copy file="dist/wmsplugin.jar" todir="${user.home}/.josm/plugins"/>
+  
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
   </target>
-
+  
 </project>
Index: /applications/editors/josm/plugins/ywms/build.xml
===================================================================
--- /applications/editors/josm/plugins/ywms/build.xml	(revision 5152)
+++ /applications/editors/josm/plugins/ywms/build.xml	(revision 5153)
@@ -1,11 +1,15 @@
-<project name="ywms" default="build" basedir=".">
-  
-  <!-- point to your JOSM directory -->
-  <property name="josm" location="../../core/dist/josm-custom.jar" />
-  
+<project name="ywms" default="dist" basedir=".">
 
+  <!-- compilation properties -->
+  <property name="josm.build.dir"	value="../../core"/>
+  <property name="josm.home.dir"	value="${user.home}/.josm"/>
+  <property name="josm"			location="../../core/dist/josm-custom.jar" />
+  <property name="plugin.build.dir"	value="build"/>
+  <property name="plugin.dist.dir"	value="../dist"/>
+  <property name="plugin.name"		value="${ant.project.name}"/>
+  <property name="plugin.jar"		value="../dist/${plugin.name}.jar"/>
   
   <target name="init">
-    <mkdir dir="build"/>
+    <mkdir dir="${plugin.build.dir}"/>
   </target>
 
@@ -16,9 +20,9 @@
   </target>
 
-  <target name="build" depends="compile">
-    <copy todir="build/resources">
+  <target name="dist" depends="compile">
+    <copy todir="${plugin.build.dir}/resources">
       <fileset dir="resources"/>
     </copy>
-    <copy todir="build/images">
+    <copy todir="${plugin.build.dir}/images">
       <fileset dir="images"/>
     </copy>
@@ -31,5 +35,5 @@
     <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
     <delete file="REVISION"/>
-    <jar destfile="ywms.jar" basedir="build">
+    <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
       <manifest>
 	<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ywms.YWMSPlugin"/>
@@ -43,9 +47,10 @@
 
   <target name="clean">
-    <delete dir="build" />
+    <delete dir="${plugin.build.dir}" />
+    <delete file="${plugin.jar}" />
   </target>
-
-  <target name="install" depends="build">
-    <copy file="ywms.jar" todir="${user.home}/.josm/plugins"/>
+  
+  <target name="install" depends="dist">
+    <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
   </target>