diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 4a988c5..0ee347a 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -231,7 +231,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        11
-%global rpmrelease      0
+%global rpmrelease      1
 #%%global tagsuffix      ""
 # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit
 %if %is_system_jdk
@@ -1387,12 +1387,6 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
 # Fixes annocheck warnings in assembler files due to missing build notes
 EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -Wa,--generate-missing-build-notes=yes"
 EXTRA_CFLAGS="$EXTRA_CFLAGS -Wa,--generate-missing-build-notes=yes"
-# Fix for GCC 9 on i686. See:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1683095
-%ifarch %{ix86}
-EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -fno-tree-ch"
-EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-tree-ch"
-%endif
 export EXTRA_CFLAGS
 
 for suffix in %{build_loop} ; do
@@ -1855,6 +1849,11 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Fri Jul 26 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.4.11-1
+- Remove -fno-tree-ch workaround for i686 as the root cause has been
+  fixed with 11.0.4+9.
+- Resolves RHBZ#1683095
+
 * Tue Jul 09 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.4.11-0
 - Update to shenandoah-jdk-11.0.4+11 (GA)
 - Switch to GA mode for final release.