diff --git a/0001-Fix-compilation-with-recent-glibc-where-SIGSTKSZ-is-.patch b/0001-Fix-compilation-with-recent-glibc-where-SIGSTKSZ-is-.patch
new file mode 100644
index 0000000..322cf2c
--- /dev/null
+++ b/0001-Fix-compilation-with-recent-glibc-where-SIGSTKSZ-is-.patch
@@ -0,0 +1,29 @@
+From 4cfcffe3ec88dcef8d779ed55a782d351cdffb9c Mon Sep 17 00:00:00 2001
+From: Lauri Nurmi <lanurmi@iki.fi>
+Date: Wed, 4 Aug 2021 08:45:50 +0300
+Subject: [PATCH] Fix compilation with recent glibc where SIGSTKSZ is not
+ constant. (#3378)
+
+---
+ cli/cppcheckexecutor.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
+index 49a8a6f..3fa0857 100644
+--- a/cli/cppcheckexecutor.cpp
++++ b/cli/cppcheckexecutor.cpp
+@@ -334,7 +334,11 @@ static void print_stacktrace(FILE* output, bool demangling, int maxdepth, bool l
+ #endif
+ }
+ 
++#ifdef __USE_DYNAMIC_STACK_SIZE
++static const size_t MYSTACKSIZE = 16*1024+32768; // wild guess about a reasonable buffer
++#else
+ static const size_t MYSTACKSIZE = 16*1024+SIGSTKSZ; // wild guess about a reasonable buffer
++#endif
+ static char mytstack[MYSTACKSIZE]= {0}; // alternative stack for signal handler
+ static bool bStackBelowHeap=false; // lame attempt to locate heap vs. stack address space. See CppCheckExecutor::check_wrapper()
+ 
+-- 
+2.33.0
+
diff --git a/cppcheck.changes b/cppcheck.changes
index b3a6c62..e9c08a2 100644
--- a/cppcheck.changes
+++ b/cppcheck.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Sep 19 09:10:14 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add glibc 2.34 build fix:
+  * 0001-Fix-compilation-with-recent-glibc-where-SIGSTKSZ-is-.patch
+
 -------------------------------------------------------------------
 Sat Jul 17 13:10:26 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/cppcheck.spec b/cppcheck.spec
index 6773548..1d2a765 100644
--- a/cppcheck.spec
+++ b/cppcheck.spec
@@ -24,6 +24,8 @@ License:        GPL-3.0-or-later
 URL:            https://github.com/danmar/cppcheck
 Source:         https://github.com/danmar/cppcheck/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         fix-i586.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Fix-compilation-with-recent-glibc-where-SIGSTKSZ-is-.patch
 BuildRequires:  cmake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gcc-c++