Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml	(revision 34037)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml	(revision 34038)
@@ -34,4 +34,20 @@
             <compilerarg value="-Xlint:unchecked" />
         </javac>
+    </target>
+    <target name="javadoc" depends="init">
+        <javadoc destdir="javadoc"
+                sourcepath="${plugin.src.dir}"
+                encoding="UTF-8"
+                windowtitle="${ant.project.name}"
+                use="true"
+                private="true"
+                linksource="true"
+                author="false">
+            <classpath refid="compile.path"/>
+            <link href="http://docs.oracle.com/javase/8/docs/api"/>
+            <link href="https://josm.openstreetmap.de/doc"/>
+            <doctitle><![CDATA[<h2>${ant.project.name} - Javadoc</h2>]]></doctitle>
+            <bottom><![CDATA[<a href="https://josm.openstreetmap.de/wiki/Plugins">JOSM Plugins</a>]]></bottom>
+        </javadoc>
     </target>
 
Index: /applications/editors/josm/plugins/build-common.xml
===================================================================
--- /applications/editors/josm/plugins/build-common.xml	(revision 34037)
+++ /applications/editors/josm/plugins/build-common.xml	(revision 34038)
@@ -210,4 +210,22 @@
         </condition>
     </target>
+    <target name="javadoc">
+        <javadoc destdir="javadoc"
+                sourcepath="${plugin.src.dir}"
+                encoding="UTF-8"
+                windowtitle="JOSM-${ant.project.name}"
+                use="true"
+                private="true"
+                linksource="true"
+                author="false">
+            <classpath refid="plugin.classpath"/>
+            <link href="http://docs.oracle.com/javase/8/docs/api"/>
+            <link href="https://josm.openstreetmap.de/doc"/>
+            <doctitle><![CDATA[<h2>JOSM-${ant.project.name} - Javadoc</h2>]]></doctitle>
+            <bottom><![CDATA[<a href="https://josm.openstreetmap.de/wiki/Plugins">JOSM Plugins</a>]]></bottom>
+            <arg value="--add-exports" if:set="isJava9" />
+            <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
+        </javadoc>
+    </target>
     <!--
     **********************************************************
Index: /applications/editors/josm/plugins/build.xml
===================================================================
--- /applications/editors/josm/plugins/build.xml	(revision 34037)
+++ /applications/editors/josm/plugins/build.xml	(revision 34038)
@@ -48,3 +48,6 @@
         <iterate target="spotbugs"/>
     </target>
+    <target name="javadoc">
+        <iterate target="javadoc"/>
+    </target>
 </project>
Index: /applications/editors/josm/plugins/eventbus/.checkstyle
===================================================================
--- /applications/editors/josm/plugins/eventbus/.checkstyle	(revision 34037)
+++ /applications/editors/josm/plugins/eventbus/.checkstyle	(revision 34038)
@@ -5,5 +5,5 @@
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
-  <fileset name="all" enabled="true" check-config-name="JOSM Checkstyle checks" local="false">
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
Index: /applications/editors/josm/plugins/mapdust/.classpath
===================================================================
--- /applications/editors/josm/plugins/mapdust/.classpath	(revision 34037)
+++ /applications/editors/josm/plugins/mapdust/.classpath	(revision 34038)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry excluding="build|data" including="conf/|images/" kind="src" path=""/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-    <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-    <classpathentry combineaccessrules="false" kind="src" path="/JOSM-GSON"/>
-    <classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="build|data" including="resources/|null" kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-GSON"/>
+	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: /applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- /applications/editors/josm/plugins/mapdust/build.xml	(revision 34037)
+++ /applications/editors/josm/plugins/mapdust/build.xml	(revision 34038)
@@ -21,15 +21,4 @@
         <delete dir="${apidoc.dir}"/>
         <delete file="${plugin.jar}"/>
-    </target>
-
-    <!-- creates the javadocs -->
-    <target name="javadoc">
-        <mkdir dir="${apidoc.dir}"/>
-        <javadoc destdir="${apidoc.dir}" source="1.8" classpathref="classpath" windowtitle="MapDust plugin API">
-            <link href="http://java.sun.com/javase/8/docs/api/"/>
-            <link href="http://docs.jboss.org/hibernate/stable/core/api/"/>
-            <packageset dir="${plugin.src.dir}">
-            </packageset>
-        </javadoc>
     </target>
 
Index: /applications/editors/josm/plugins/routes/build.xml
===================================================================
--- /applications/editors/josm/plugins/routes/build.xml	(revision 34037)
+++ /applications/editors/josm/plugins/routes/build.xml	(revision 34038)
@@ -44,4 +44,5 @@
     <target name="checkstyle"/>
     <target name="spotbugs"/>
+    <target name="javadoc"/>
     <target name="revision">
         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">