diff --git a/java-17-openjdk.changes b/java-17-openjdk.changes
index 0eca2f4..c6a20f4 100644
--- a/java-17-openjdk.changes
+++ b/java-17-openjdk.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 20 06:41:11 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * jdk11-glibc234.patch
+    + fix build with glibc-2.34 (bsc#1189201)
+
 -------------------------------------------------------------------
 Thu Sep 16 06:16:11 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
@@ -18,6 +25,13 @@ Mon Sep 13 12:46:09 UTC 2021 - Fridrich Strba <fstrba@suse.com>
     + revert recent changes making NSS provider the default one
     + fixes bsc#1190252
 
+-------------------------------------------------------------------
+Thu Aug 26 13:45:59 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * jdk11-glibc234.patch
+    + fix build with glibc-2.34 (bsc#1189201)
+
 -------------------------------------------------------------------
 Mon Aug 23 07:16:54 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index da28610..d0d4229 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -214,6 +214,8 @@ Patch18:        fips.patch
 #
 Patch20:        loadAssistiveTechnologies.patch
 #
+Patch30:        openjdk-glibc234.patch
+#
 # OpenJDK specific patches
 #
 Patch200:       ppc_stack_overflow_fix.patch
@@ -506,6 +508,8 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
 
 %patch20 -p1
 
+%patch30 -p1
+
 %patch200 -p1
 
 %ifarch %{arm6}
diff --git a/openjdk-glibc234.patch b/openjdk-glibc234.patch
new file mode 100644
index 0000000..ce7a235
--- /dev/null
+++ b/openjdk-glibc234.patch
@@ -0,0 +1,21 @@
+--- openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-04-09 11:36:58.000000000 +0200
++++ openjdk/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c	2021-08-26 15:42:52.326232581 +0200
+@@ -67,8 +67,17 @@
+   longjmp(context, 1);
+ }
+ 
++static char* altstack = NULL;
++
+ void set_signal_handler() {
+-  static char altstack[SIGSTKSZ];
++  if (altstack == NULL) {
++    // Dynamically allocated in case SIGSTKSZ is not constant
++    altstack = malloc(SIGSTKSZ);
++    if (altstack == NULL) {
++      fprintf(stderr, "Test ERROR. Unable to malloc altstack space\n");
++      exit(7);
++    }
++  }
+ 
+   stack_t ss = {
+     .ss_size = SIGSTKSZ,