diff --git a/.gitignore b/.gitignore
index c571fcc..94c24c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
 /shenandoah-jdk11-shenandoah-jdk-11.0.7+10.tar.xz
 /shenandoah-jdk11-shenandoah-jdk-11.0.8+1-4curve.tar.xz
 /shenandoah-jdk11-shenandoah-jdk-11.0.8+2-4curve.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.8+3-4curve.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index e1f9b2a..607983a 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -225,7 +225,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        2
+%global buildver        3
 %global rpmrelease      0
 #%%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
@@ -1073,8 +1073,6 @@ Patch8: s390-8214206_fix.patch
 # able to be removed once that release is out
 # and used by this RPM.
 #############################################
-# JDK-8233880: Support compilers with multi-digit major version numbers
-Patch13: jdk8233880-compiler_versioning.patch
 
 #############################################
 #
@@ -1310,7 +1308,6 @@ pushd %{top_level_dir_name}
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch13 -p1
 popd # openjdk
 
 %patch1000
@@ -1856,6 +1853,10 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Tue May 19 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.8.3-0.0.ea
+- Update to shenandoah-jdk-11.0.8+3 (EA)
+- Drop JDK-8233880 backport now applied upstream.
+
 * Mon May 18 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.8.2-0.0.ea
 - Update to shenandoah-jdk-11.0.8+2 (EA)
 
diff --git a/jdk8233880-compiler_versioning.patch b/jdk8233880-compiler_versioning.patch
deleted file mode 100644
index 5cc0460..0000000
--- a/jdk8233880-compiler_versioning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User fweimer
-# Date 1573592408 0
-#      Tue Nov 12 21:00:08 2019 +0000
-# Node ID a60e328f4f3dfb06fad4e071575f5f45196d4fc3
-# Parent  9828d04ee2c7e1aefe07acb61706375ea5da58b7
-8233880: Support compilers with multi-digit major version numbers
-Reviewed-by: tbell
-
-diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
---- a/make/autoconf/toolchain.m4
-+++ b/make/autoconf/toolchain.m4
-@@ -461,7 +461,7 @@
-     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
-         $SED -e 's/ *Copyright .*//'`
-     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
--        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
-+        $SED -e 's/^.* \(@<:@1-9@:>@<:@0-9@:>@*\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
-   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
-     # clang --version output typically looks like
-     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
diff --git a/sources b/sources
index 10ec80d..5dd24d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.8+2-4curve.tar.xz) = 27ecb76e0826ba957936153f370b097893bc1dd303ce61b7b122213ae48f22322bdc58ecb4c5458cfc3eb3ef27df2f0134cddf6e005ba0b1952fc551ecacde06
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.8+3-4curve.tar.xz) = 13e8d3286b218747ffa1977a3584bc1970437069e5e8855d01b97711ab9566271e141f3314ccaab78610c68fb298c3f88b4ca13e0736cba1ab98189f5a66035b