diff --git a/josm-0-add_classpath.patch b/josm-0-add_classpath.patch
index 885f89e..c6a3e87 100644
--- a/josm-0-add_classpath.patch
+++ b/josm-0-add_classpath.patch
@@ -17,7 +17,7 @@
      <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"
++        <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"/>
@@ -30,15 +30,17 @@
              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,7 +292,7 @@ Build-Date: ${build.tstamp}
+@@ -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/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
++            excludes="com/**,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}"
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
index f813ca6..6f10687 100644
--- a/josm-generate-tarball.sh
+++ b/josm-generate-tarball.sh
@@ -25,9 +25,10 @@ svn -r ${JOSM_SVN_TAG} export https://josm.openstreetmap.de/svn/trunk/ ${NAME_VE
 rm -r ${NAME_VERSION}/src/org/apache
 # Delete org.glassfish.json, it can be found in buildrequires ant package
 rm -r ${NAME_VERSION}/src/org/glassfish
-rm -r ${NAME_VERSION}/src/oauth
 rm -r ${NAME_VERSION}/src/com/drew
 rm -r ${NAME_VERSION}/src/com/kitfox
+# The signpost-core package was retired from Fedora so leave it bundled for now
+#rm -r ${NAME_VERSION}/src/oauth
 
 # We do not run tests
 rm -r ${NAME_VERSION}/test/
diff --git a/josm.spec b/josm.spec
index e35e653..b82359a 100644
--- a/josm.spec
+++ b/josm.spec
@@ -33,7 +33,6 @@ BuildRequires:  ant
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  gettext
 BuildRequires:  javacc
-BuildRequires:  signpost-core >= 1.2.1.1
 BuildRequires:  metadata-extractor2 >= 2.9.0
 BuildRequires:  svgsalamander
 BuildRequires:  apache-commons-codec
@@ -66,6 +65,7 @@ Requires:       java-1.8.0-openjdk-openjfx
 Provides: bundled(gnu-getopt) = 1.0.5
 Provides: bundled(openjdk-javax-json)
 Provides: bundled(gdata-java)
+Provides: bundled(signpost-core) = 1.2.1.1
 
 
 %description
@@ -97,7 +97,6 @@ find . -name '*.class' -exec rm -f '{}' \;
 
 # The following subdirectories of bundled libraries are already removed
 # from the generated tarball:
-#  * signpost-core (src/oauth)
 #  * metadata-extractor2 (src/com/drew)
 #  * svgSalamander (src/com/kitfox)
 #  * glassfish (src/org/glassfish)
@@ -110,7 +109,6 @@ find . -name '*.class' -exec rm -f '{}' \;
 mkdir -p lib
 build-jar-repository -s lib \
 metadata-extractor2-2 \
-signpost-core \
 svgsalamander \
 ant \
 jsonp \
@@ -137,7 +135,7 @@ cp -rp javadoc  \
 
 install -p -m 644 dist/%{name}-custom.jar %{buildroot}%{_javadir}/%{name}.jar
 
-%jpackage_script %{fqdn}.gui.MainApplication "" "" josm:metadata-extractor2-2:ant:signpost-core:apache-commons-codec:svgsalamander:xmpcore:apache-commons-compress:apache-commons-jcs:apache-commons-logging:jsonp josm true
+%jpackage_script %{fqdn}.gui.MainApplication "" "" josm:metadata-extractor2-2:ant:apache-commons-codec:svgsalamander:xmpcore:apache-commons-compress:apache-commons-jcs:apache-commons-logging:jsonp josm true
 
 install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
 install -p -m 644 images/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{fqdn}.svg