--- build.xml.patch1	2017-01-02 20:31:13.289502203 +0100
+++ build.xml	2017-01-02 20:46:47.217403900 +0100
@@ -37,6 +37,11 @@
         <condition property="java.library.dir" value="jmods" else="lib">
             <isset property="isJava9"/>
         </condition>
+        <path id="classpath">
+            <fileset dir="/usr/share/java/">
+                <include name="**/*.jar"/>
+            </fileset>
+        </path>
         <path id="test.classpath">
             <fileset dir="${test.dir}/lib">
                 <include name="**/*.jar"/>
@@ -221,7 +226,7 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile-cots" depends="init">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" classpathref="classpath" nowarn="on" encoding="UTF-8" includes="javax/**,oauth/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
@@ -264,7 +269,7 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile-jmapviewer" depends="init">
         <!-- JMapViewer -->
-        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
+        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" fork="yes"
             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
@@ -287,8 +292,8 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
         <!-- JOSM -->
-        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
-            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
+        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" fork="yes"
+            excludes="com/drew/kitfox/**,com/drew/kitfox/**,com/drew/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
             <compilerarg line="-XDcompilePolicy=simple"/>
@@ -325,6 +330,7 @@ Build-Date: ${build.tstamp}
         <javadoc destdir="javadoc"
                 sourcepath="${src.dir}"
                 encoding="UTF-8"
+                classpathref="classpath"
                 packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
                 excludepackagenames="org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*"
                 windowtitle="JOSM"
@@ -767,6 +773,9 @@ Build-Date: ${build.tstamp}
             <sysproperty key="java.awt.headless" value="true"/>
             <classpath>
                 <pathelement path="${base.dir}"/>
+	        <fileset dir="lib">
+                  <include name="**/*.jar"/>
+                </fileset>
                 <pathelement path="${proj-classpath}"/>
                 <pathelement path="${proj-build.dir}"/>
             </classpath>