diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 7f7dfe3..6a58efa 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun 14 13:31:41 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Fix condition enabling shenandoah GC only for Factory. It was by
+  mistake enabled for SLE too (bsc#1226274)
+- Disable shenandoah for all distributions, since the shenandoah
+  hotspot tarball is rather out of sync.
+
 -------------------------------------------------------------------
 Mon May  6 17:41:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index e6c3108..d660cf3 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -128,11 +128,11 @@
 %if 0%{?__isa_bits}
 %global bits %{__isa_bits}
 %endif
-%if 0%{?suse_version} > 1500 && !0%{?sle_version}
-%global with_shenandoah 1
-%else
+#if 0%{?suse_version} > 1500 && !0%{?sle_version}
+#global with_shenandoah 1
+#else
 %global with_shenandoah 0
-%endif
+#endif
 %global NSS_LIBDIR %(pkg-config --variable=libdir nss)
 %bcond_without bootstrap
 %bcond_with zero
@@ -502,7 +502,7 @@ sh autogen.sh
 %ifarch %{arm}
         --with-hotspot-src-zip=%{SOURCE2} \
 %else
-%if %{without zero} && %{with shenandoah}
+%if %{without zero} && %{with_shenandoah}
         --with-hotspot-src-zip=%{SOURCE3} \
         --with-hotspot-build=shenandoah \
 %endif