Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 12534)
+++ trunk/build.xml	(revision 12582)
@@ -24,4 +24,5 @@
         <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
         <property name="proj-build.dir" location="${base.dir}/build2"/>
+        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
         <property name="groovy.jar" location="${base.dir}/tools/groovy-all.jar"/>
@@ -302,5 +303,5 @@
         </javac>
         <!-- JOSM -->
-        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
+        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
             excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
             destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
@@ -366,4 +367,5 @@
         <delete dir="${build.dir}"/>
         <delete dir="${proj-build.dir}"/>
+        <delete dir="${checkstyle-build.dir}"/>
         <delete dir="${dist.dir}"/>
         <delete dir="${mapcss.dir}/parsergen"/>
@@ -760,7 +762,15 @@
     </target>
 
-    <target name="checkstyle" depends="init-properties">
+    <target name="checkstyle-compile" depends="init-properties">
+        <mkdir dir="${checkstyle-build.dir}"/>
+        <javac sourcepath="" srcdir="${base.dir}/tools/checkstyle/checks" failonerror="true"
+            destdir="${checkstyle-build.dir}" target="1.8" source="1.8" debug="on"
+            includeantruntime="false" createMissingPackageInfoClass="false"
+            encoding="UTF-8" classpath="tools/checkstyle/checkstyle-all.jar">
+        </javac>
+    </target>
+    <target name="checkstyle" depends="checkstyle-compile">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
-             classpath="tools/checkstyle/checkstyle-all.jar"/>
+             classpath="tools/checkstyle/checkstyle-all.jar:dist/josm-custom.jar:${checkstyle-build.dir}"/>
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"