Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 5016)
+++ /applications/editors/josm/plugins/build.xml	(revision 5017)
@@ -22,44 +22,44 @@
 
 	<target name="build" depends="compile">
-		<ant dir="colorscheme" antfile="build.xml" target="dist"/>
-		<!--ant dir="grid" antfile="build.xml" target="build"/-->
-		<ant dir="lang" antfile="build.xml" target="install-all"/>
-		<ant dir="livegps" antfile="build.xml" target="dist"/>
-		<ant dir="mappaint" antfile="build.xml" target="build"/>
-		<ant dir="namefinder" antfile="build.xml" target="dist"/>
-		<!-- ant dir="navigator" 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="pluginmanager" antfile="build.xml" target="dist"/ --> 
-		<ant dir="slippymap" antfile="build.xml" target="dist"/>
-		<!-- ant dir="surveyor" antfile="build.xml" target="dist"/-->
-		<ant dir="tagging-preset-tester" antfile="build.xml" target="build"/>
-		<!-- ant dir="tways" antfile="build.xml" target="build"/ --> 
-		<ant dir="validator" antfile="build.xml" target="build"/>
-		<!-- ant dir="waypoints" antfile="build.xml" target="build"/ -->
-		<ant dir="wmsplugin" antfile="build.xml" target="build"/>
-		<ant dir="ywms" antfile="build.xml" target="build"/>
+		<ant	dir="colorscheme"	antfile="build.xml"	target="dist"/>
+	<!--ant	dir="grid"	antfile="build.xml"	target="build"/-->
+		<ant	dir="lang"	antfile="build.xml"	target="install-all"/>
+		<ant	dir="livegps"	antfile="build.xml"	target="dist"/>
+		<ant	dir="mappaint"	antfile="build.xml"	target="build"/>
+		<ant	dir="namefinder"	antfile="build.xml"	target="dist"/>
+	<!-- ant	dir="navigator"	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="pluginmanager"	antfile="build.xml"	target="dist"/ --> 
+		<ant	dir="slippymap"	antfile="build.xml"	target="dist"/>
+		<ant	dir="surveyor"	antfile="build.xml"	target="dist"/>
+		<ant	dir="tagging-preset-tester"	antfile="build.xml"	target="build"/>
+	<!-- ant	dir="tways"	antfile="build.xml"	target="build"/ --> 
+		<ant	dir="validator"	antfile="build.xml"	target="build"/>
+	<!-- ant	dir="waypoints"	antfile="build.xml"	target="build"/ -->
+		<ant	dir="wmsplugin"	antfile="build.xml"	target="build"/>
+		<ant	dir="ywms"	antfile="build.xml"	target="build"/>
 	</target>
 
 	<target name="clean">
-		<ant dir="colorscheme" antfile="build.xml" target="clean"/>
-		<!--ant dir="grid" antfile="build.xml" target="clean"/-->
-		<!--ant dir="lang" antfile="build.xml" target="clean"/-->
-		<ant dir="livegps" antfile="build.xml" target="clean"/>
-		<ant dir="mappaint" antfile="build.xml" target="clean"/>
-		<ant dir="namefinder" antfile="build.xml" target="clean"/>
-		<ant dir="navigator" antfile="build.xml" target="clean"/>
-		<ant dir="nearclick" 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="surveyor" 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="validator" antfile="build.xml" target="clean"/>
-		<ant dir="waypoints" antfile="build.xml" target="clean"/>
-		<ant dir="wmsplugin" antfile="build.xml" target="clean"/>
-		<ant dir="ywms" antfile="build.xml" target="clean"/>
+		<ant	dir="colorscheme"	antfile="build.xml"	target="clean"/>
+		<ant	dir="grid"	antfile="build.xml"	target="clean"/>
+		<ant	dir="lang"	antfile="build.xml"	target="clean"/>
+		<ant	dir="livegps"	antfile="build.xml"	target="clean"/>
+		<ant	dir="mappaint"	antfile="build.xml"	target="clean"/>
+		<ant	dir="namefinder"	antfile="build.xml"	target="clean"/>
+		<ant	dir="navigator"	antfile="build.xml"	target="clean"/>
+		<ant	dir="nearclick"	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="surveyor"	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="validator"	antfile="build.xml"	target="clean"/>
+		<ant	dir="waypoints"	antfile="build.xml"	target="clean"/>
+		<ant	dir="wmsplugin"	antfile="build.xml"	target="clean"/>
+		<ant	dir="ywms"	antfile="build.xml"	target="clean"/>
 	</target>
 
Index: /applications/editors/josm/plugins/grid/build.xml
===================================================================
--- /applications/editors/josm/plugins/grid/build.xml	(revision 5016)
+++ /applications/editors/josm/plugins/grid/build.xml	(revision 5017)
@@ -1,6 +1,13 @@
 <project name="grid" default="build" 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"/>
+  
 	<!-- point to your JOSM directory -->
-	<property name="josm" location="../../core/dist/josm-custom.jar" />
+	<property name="josm" location="${josm.build.dir}/dist/josm-custom.jar" />
 
 
@@ -21,5 +28,5 @@
 			<fileset dir="images" />
 		</copy>
-		<jar destfile="dist/grid.jar" basedir="build">
+		<jar destfile="${plugin.jar}" basedir="build">
 			<manifest>
 				<attribute name="Plugin-Class" value="grid.GridPlugin" />
@@ -32,9 +39,11 @@
 		<delete dir="build" />
 		<delete dir="dist" />
+		<delete dir="${plugin.jar}" />
 	</target>
 
 	<target name="install" depends="build">
-		<copy file="dist/grid.jar" todir="${user.home}/.josm/plugins"/>
+		<copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
 	</target>
 
+
 </project>
Index: /applications/editors/josm/plugins/lang/build.xml
===================================================================
--- /applications/editors/josm/plugins/lang/build.xml	(revision 5016)
+++ /applications/editors/josm/plugins/lang/build.xml	(revision 5017)
@@ -1,6 +1,12 @@
 <project name="lang" default="install-all" basedir=".">
 
-	<property name="josm" value="../../core" />
-	<property name="plugins" value=".."/>
+
+  <!-- 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="install-all" depends="josm-build,keys.pot">
@@ -14,5 +20,5 @@
 		<mkdir dir="${language}/bin"/>
 		<mkdir dir="dist"/>
-		<javac srcdir="${language}/src" classpath="${josm}/dist/josm-custom.jar" destdir="${language}/bin" />
+		<javac srcdir="${language}/src" classpath="${josm.build.dir}/dist/josm-custom.jar" destdir="${language}/bin" />
 
 		<exec executable="msgmerge">
@@ -38,10 +44,10 @@
 
 	<target name="josm-build">
-		<ant dir="${josm}" />
+		<ant dir="${josm.build.dir}" />
 	</target>
 	
 	<target name="keys.pot">
 		<exec executable="find" output="alljava.txt">
-			<arg line="${josm}/src ${plugins} -name '*.java'"/>
+			<arg line="${josm.build.dir}/src ${plugins} -name '*.java'"/>
 		</exec>
 
@@ -50,3 +56,10 @@
 		</exec>
 	</target>
+
+	<target name="clean">
+		<delete dir="build" />
+		<delete dir="dist" />
+		<delete dir="${plugin.jar}" />
+	</target>
+
 </project>