diff --git a/libb2.changes b/libb2.changes
index b574f5e..434ed54 100644
--- a/libb2.changes
+++ b/libb2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  5 13:06:38 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add upstream patch to not override CFLAGS in configure script
+
 -------------------------------------------------------------------
 Wed Mar 13 09:02:55 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/libb2.spec b/libb2.spec
index ff4270a..c1a2dc2 100644
--- a/libb2.spec
+++ b/libb2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libb2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@ License:        CC0-1.0
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/BLAKE2/libb2
 Source:         https://github.com/BLAKE2/libb2/releases/download/v%{version}/libb2-0.98.1.tar.gz
+Patch1:         https://github.com/BLAKE2/libb2/pull/24.patch
+BuildRequires:  automake
 BuildRequires:  pkgconfig
 
 %description
@@ -54,7 +56,7 @@ Requires:       %{name}-%{so_suffix} = %{version}-%{release}
 This package contains the development files.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure --disable-silent-rules \
diff --git a/24.patch b/24.patch
new file mode 100644
index 0000000..1d2cda8
--- /dev/null
+++ b/24.patch
@@ -0,0 +1,23 @@
+From 9b9a3a452ed7fe4599405936442b56000547ea0c Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
+Date: Thu, 14 Mar 2019 16:11:43 +0100
+Subject: [PATCH] Update configure.ac, do not override CFLAGS from the system
+
+By default, AX_CHECK_COMPILE_FLAG overrides the *FLAG, so lets stop doing that.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c441da9..9cf20bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -60,7 +60,7 @@ AC_HELP_STRING([--enable-native],
+                [enable_native=yes]
+ )
+ 
+-AX_CHECK_COMPILE_FLAG([-O3], [CFLAGS=-O3])
++AX_CHECK_COMPILE_FLAG([-O3], [CFLAGS="$CFLAGS -O3"])
+ dnl Not all architectures support -march=native
+ if test $enable_native == "yes"; then
+   AX_CHECK_COMPILE_FLAG([-march=native], [], [enable_native=no])