Index: applications/editors/josm/plugins/build-common.xml
===================================================================
--- applications/editors/josm/plugins/build-common.xml	(revision 34044)
+++ applications/editors/josm/plugins/build-common.xml	(revision 34045)
@@ -23,4 +23,5 @@
     <property name="plugin.test.dir"        location="test"/>
     <property name="plugin.src.dir"         location="src"/>
+    <property name="plugin.doc.dir"         location="javadoc"/>
     <property name="plugin.lib.dir"         location="lib"/>
     <!-- this is the directory where the plugin jar is copied to -->
@@ -29,4 +30,6 @@
     <property name="ant.build.javac.source" value="1.8"/>
     <property name="plugin.jar"             location="${plugin.dist.dir}/${ant.project.name}.jar"/>
+    <property name="plugin.sources.jar"     location="${plugin.dist.dir}/${ant.project.name}-sources.jar"/>
+    <property name="plugin.javadoc.jar"     location="${plugin.dist.dir}/${ant.project.name}-javadoc.jar"/>
     <property name="javac.compiler"         value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
 
@@ -120,8 +123,8 @@
     <!--
     **********************************************************
-    ** dist - creates the plugin jar
-    **********************************************************
-    -->
-    <target name="dist" depends="compile,revision" unless="skip-dist">
+    ** dist - creates the plugin jars
+    **********************************************************
+    -->
+    <target name="dist" depends="compile,javadoc,revision" unless="skip-dist">
         <echo message="creating ${ant.project.name}.jar ... "/>
         <antcall target="setup-dist" />
@@ -183,4 +186,6 @@
             </restrict>
         </jar>
+        <jar destfile="${plugin.sources.jar}" basedir="${plugin.src.dir}"/>
+        <jar destfile="${plugin.javadoc.jar}" basedir="${plugin.doc.dir}"/>
         <delete file="MANIFEST" failonerror="no"/>
         <antcall target="post-dist" />
@@ -211,5 +216,5 @@
     </target>
     <target name="javadoc">
-        <javadoc destdir="javadoc"
+        <javadoc destdir="${plugin.doc.dir}"
                 sourcepath="${plugin.src.dir}"
                 encoding="UTF-8"
@@ -220,5 +225,5 @@
                 author="false">
             <classpath refid="plugin.classpath"/>
-            <link href="http://docs.oracle.com/javase/8/docs/api"/>
+            <link href="https://docs.oracle.com/javase/8/docs/api"/>
             <link href="https://josm.openstreetmap.de/doc"/>
             <doctitle><![CDATA[<h2>JOSM-${ant.project.name} - Javadoc</h2>]]></doctitle>
@@ -323,6 +328,9 @@
     <target name="clean">
         <delete dir="${plugin.build.dir}"/>
+        <delete dir="${plugin.doc.dir}"/>
         <delete dir="${checkstyle-build.dir}"/>
         <delete file="${plugin.jar}"/>
+        <delete file="${plugin.sources.jar}"/>
+        <delete file="${plugin.javadoc.jar}"/>
     </target>
     <!--
@@ -399,4 +407,6 @@
             <arg value="up"/>
             <arg value="../dist/${plugin.jar}"/>
+            <arg value="../dist/${plugin.javadoc.jar}"/>
+            <arg value="../dist/${plugin.sources.jar}"/>
         </exec>
     </target>
@@ -421,4 +431,6 @@
             <arg value="commit"/>
             <arg value="${plugin.jar}"/>
+            <arg value="${plugin.sources.jar}"/>
+            <arg value="${plugin.javadoc.jar}"/>
         </exec>
     </target>