diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index ff8bbbc..ce6bbb2 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov  4 11:32:33 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Enable Shenandoah garbage collector on supported architectures
+
 -------------------------------------------------------------------
 Mon Nov  2 16:04:46 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index ed2bd15..9e16e7b 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -146,6 +146,7 @@
 %else
 %global with_systemtap 0
 %endif
+%global with_shenandoah 1
 %if %{with_systemtap}
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,
@@ -175,7 +176,8 @@ Source6:        http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_
 Source7:        http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/langtools.tar.xz
 Source8:        http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/hotspot.tar.xz
 Source9:        http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/aarch32.tar.xz
-Source10:       http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
+Source10:       http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/shenandoah.tar.xz
+Source11:       http://icedtea.wildebeest.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
 # RPM/distribution specific patches
 # RHBZ 1015432
 Patch2:         1015432.patch
@@ -511,9 +513,14 @@ sh autogen.sh
 %ifarch %{arm}
         --with-hotspot-src-zip=%{SOURCE9} \
 %else
+%if %{with zero} || %{without shenandoah}
         --with-hotspot-src-zip=%{SOURCE8} \
+%else
+        --with-hotspot-src-zip=%{SOURCE10} \
+        --with-hotspot-build=shenandoah \
 %endif
-        --with-nashorn-src-zip=%{SOURCE10}
+%endif
+        --with-nashorn-src-zip=%{SOURCE11}
 
 make patch %{?_smp_mflags}
 
diff --git a/shenandoah.tar.xz b/shenandoah.tar.xz
new file mode 100644
index 0000000..bd328d5
--- /dev/null
+++ b/shenandoah.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1718e537f195adba5f98e30d115cc15db530d3f91e88cdbaaf307ea4220f7cc9
+size 7277048