diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 0dda2a8..99f5ccf 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -3,10 +3,10 @@ Thu Nov 26 19:13:31 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
 - Update to version jdk8u275 (icedtea 3.17.1)
   * Import of OpenJDK 8 u275 build 01
-    + JDK-8214440: ldap over a TLS connection negotiate failed
-      with "javax.net.ssl.SSLPeerUnverifiedException: hostname
-      of the server "does not match the hostname in the server's
-      certificate"
+    + JDK-8214440, bsc#1179441: ldap over a TLS connection negotiate
+      failed with "javax.net.ssl.SSLPeerUnverifiedException:
+      hostname of the server "does not match the hostname in the
+      server's certificate"
     + JDK-8223940: Private key not supported by chosen signature
       algorithm
     + JDK-8236512: PKCS11 Connection closed after Cipher.doFinal
@@ -36,6 +36,7 @@ Thu Nov  5 18:06:39 UTC 2020 - Archie Cobbs <archie.cobbs@gmail.com>
 Wed Nov  4 11:32:33 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
 - Enable Shenandoah garbage collector on supported architectures
+  and distributions
 
 -------------------------------------------------------------------
 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 ff65904..e4bf0c9 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -146,7 +146,11 @@
 %else
 %global with_systemtap 0
 %endif
-%global with_shenandoah 1
+%if 0%{?suse_version} > 1500 && !0%{?sle_version}
+%global with_shanandoah 1
+%else
+%global with_shenandoah 0
+%endif
 %if %{with_systemtap}
 # Where to install systemtap tapset (links)
 # We would like these to be in a package specific subdir,