diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index 7d05cf3..20d830e 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -1,54 +1,52 @@
 --- 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="isJava9">
-             <equals arg1="${ant.java.version}" arg2="1.9" />
+                 <isset property="isJava11"/>
+             </not>
          </condition>
-+ 	<path id="classpath">
-+             <fileset dir="lib">
-+                 <include name="**/*.jar"/>
-+             </fileset>
-+ 	</path>
++        <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" depends="init,javacc">
+     <target name="compile-cots" depends="init">
          <!-- COTS -->
--        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
+-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
 +        <javac srcdir="${src.dir}" classpathref="classpath" nowarn="on" encoding="UTF-8"
-             destdir="build" target="1.8" source="1.8" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
+             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}
-             <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
-         </javac>
+     </target>
+     <target name="compile-jmapviewer" depends="init">
          <!-- JMapViewer -->
 -        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
 +        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             excludes="com/**,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/**,JOSM.java,gnu/**"
-             destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+             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/**,gnu/**"
+             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
              <compilerclasspath>
 @@ -287,7 +292,7 @@ Build-Date: ${build.tstamp}
-             <compilerarg line="-Xmaxwarns 1000"/>
-         </javac>
+     </target>
+     <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
          <!-- JOSM -->
--        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
+-        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
 +        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             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">
+             excludes="com/**,javax/**,gnu/**,oauth/**,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">
              <compilerclasspath>
-@@ -325,7 +330,8 @@ Build-Date: ${build.tstamp}
+@@ -325,6 +330,7 @@ Build-Date: ${build.tstamp}
          <javadoc destdir="javadoc"
                  sourcepath="${src.dir}"
                  encoding="UTF-8"
--                packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
-+		classpathref="classpath"                
-+		packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
++                classpathref="classpath"
+                 packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
                  excludepackagenames="org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*"
                  windowtitle="JOSM"
-                 use="true"
 @@ -767,6 +773,9 @@ Build-Date: ${build.tstamp}
              <sysproperty key="java.awt.headless" value="true"/>
              <classpath>
diff --git a/josm-0-remove_errorprone.patch b/josm-0-remove_errorprone.patch
index 56ac237..4b2ea12 100644
--- a/josm-0-remove_errorprone.patch
+++ b/josm-0-remove_errorprone.patch
@@ -1,51 +1,15 @@
---- build.xml.patch3	2017-01-03 20:00:48.927351550 +0100
-+++ build.xml	2017-01-03 20:03:03.267943837 +0100
-@@ -25,8 +25,6 @@
-         <property name="proj-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-2.4.7.jar"/>
--        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.14.jar"/>
--        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
-         <!-- build parameter: compression level (ant -Dclevel=N)
-                  N ranges from 0 (no compression) to 9 (maximum compression)
-                  default: 9 -->
-@@ -270,12 +268,9 @@ Build-Date: ${build.tstamp}
-             <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
-         </javac>
-         <!-- JMapViewer -->
--        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-+        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             excludes="com/**,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/**,JOSM.java,gnu/**"
-             destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
--            <compilerclasspath>
--                <pathelement location="${error_prone_ant.jar}"/>
--            </compilerclasspath>
-             <compilerarg value="-Xlint:cast"/>
-             <compilerarg value="-Xlint:deprecation"/>
-             <compilerarg value="-Xlint:dep-ann"/>
-@@ -289,16 +284,12 @@ Build-Date: ${build.tstamp}
-             <compilerarg value="-Xlint:unchecked"/>
-             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
-             <compilerarg value="-XDignore.symbol.file"/>
--            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
-             <compilerarg line="-Xmaxwarns 1000"/>
-         </javac>
-         <!-- JOSM -->
--        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-+        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             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">
--            <compilerclasspath>
--                <pathelement location="${error_prone_ant.jar}"/>
--            </compilerclasspath>
-             <compilerarg value="-Xlint:cast"/>
-             <compilerarg value="-Xlint:deprecation"/>
-             <compilerarg value="-Xlint:dep-ann"/>
-@@ -312,7 +303,6 @@ Build-Date: ${build.tstamp}
-             <compilerarg value="-Xlint:unchecked"/>
-             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
-             <compilerarg value="-XDignore.symbol.file"/>
--            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
-             <compilerarg line="-Xmaxwarns 1000"/>
-         </javac>
- 
+diff -up josm-0/build.xml.error_prone josm-0/build.xml
+--- josm-0/build.xml.error_prone	2018-03-26 09:16:19.814914570 +0200
++++ josm-0/build.xml	2018-03-26 09:18:07.680603915 +0200
+@@ -51,10 +51,7 @@
+         <condition property="isJava11">
+             <matches string="${ant.java.version}" pattern="1[1-9]" />
+         </condition>
+-        <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
+-        <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
+-            <isset property="isJava10"/>
+-        </condition>
++        <property name="javac.compiler" value="modern" />
+         <!-- Disable jacoco on Java 11+, see https://github.com/jacoco/jacoco/issues/629 -->
+         <condition property="coverageByDefault">
+             <not>
diff --git a/josm.spec b/josm.spec
index 2667175..767f1dc 100644
--- a/josm.spec
+++ b/josm.spec
@@ -17,12 +17,13 @@ URL:            https://josm.openstreetmap.de/
 Source0:        %{name}-%{version}.%{svn_revision}svn.tar.gz
 Source2:        %{name}-generate-tarball.sh
 
-#patch to remove metadata-extractor and signpost-core of final jar
+# patch to remove metadata-extractor and signpost-core of final jar
 Patch1:         %{name}-%{version}-add_classpath.patch
 
 #remove call to "svn info" and fix in build.xml revision and commit date
 Patch2:         %{name}-%{version}-remove_svn_call.patch
 
+# remove static analysis compiler error prone:
 Patch3:         %{name}-%{version}-remove_errorprone.patch
 
 
@@ -89,7 +90,7 @@ This package contains the API documentation for %{name}.
 %setup -q
 %patch1 -p0
 %patch2 -p1
-%patch3 -p0
+%patch3 -p1 -b .error_prone
 
 find . -name '*.jar' -exec rm -f '{}' \;
 find . -name '*.class' -exec rm -f '{}' \;