diff --git a/.gitignore b/.gitignore
index eeebd84..31ee227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@
 /libabigail-2.2.tar.xz
 /libabigail-2.3.tar.xz
 /libabigail-2.4.tar.xz
+/0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+/0002-suppression-Add-has_strict_flexible_array_data_membe.patch
diff --git a/.libabigail.metadata b/.libabigail.metadata
new file mode 100644
index 0000000..5e7425b
--- /dev/null
+++ b/.libabigail.metadata
@@ -0,0 +1,3 @@
+f73cc6c9bb815561dca6391dee5f32add8d085d0 libabigail-2.4.tar.xz
+3457513819a4debc766aa7a8dea3fb63db032225 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+8e44063322d53ef69e68f3de905859e96aee7d52 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
diff --git a/libabigail.spec b/libabigail.spec
index ec57272..d346831 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -3,13 +3,16 @@
 
 Name: libabigail
 Version: 2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Set of ABI analysis tools
 
 License: Apache 2.0 WITH LLVM-exception
 URL: https://sourceware.org/libabigail/
 Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.xz
+Patch1: 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+Patch2: 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
 
+BuildRequires: git
 BuildRequires: gcc-c++
 BuildRequires: libtool
 BuildRequires: elfutils-devel
@@ -59,7 +62,8 @@ form of man pages, texinfo documentation and API documentation in html
 format.
 
 %prep
-%setup -n %{tarball_name}
+%autosetup -v -S git
+autoreconf
 
 %build
 %configure --enable-btf --disable-deb  --disable-fedabipkgdiff --disable-zip-archive --disable-static
@@ -127,6 +131,16 @@ fi
 %doc doc/manuals/html/*
 
 %changelog
+* Thu Nov 16 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-2
+- Apply patch: 0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+  Resolves: https://issues.redhat.com/browse/RHEL-16614
+- Apply patch: 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
+  Resolves: https://issues.redhat.com/browse/RHEL-16629
+- Add git as a build requirement as we need git to apply the patches
+  aboves that apply binaries.
+- Use %%autosetup to handle applying the patches using git.
+- autoreconf after the patches touched at least one Makefile.am file.
+
 * Wed Nov 01 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
 - Update to upstream 2.4
 - Use SPDX licensing naming
diff --git a/sources b/sources
index 38e35b0..32bfac4 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (libabigail-2.4.tar.xz) = f9b51f8710c75b911da10c1e93e0b6b6fa575f99e8f37a5f51e93a8e6b79c9ad1541e531730b410385053d6565f807300f7910dca48cbd3e991d111198781d95
+SHA512 (0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch) = f2145d6f9552dcd818228c08a68b6d54f7d79c53d79c2fff18f2664ac3684d2da09670247e482a18ee8f3b44fafbac425ca8d357ea4c621212b84b8180bd989e
+SHA512 (0002-suppression-Add-has_strict_flexible_array_data_membe.patch) = 28b8eecba059e2e08e907ecc8ee9e03d57acdc94ce4e1aea4b8c51cf78c7711812215539149e5d24e77fb4c7a6b62c2e5062e7ff87b69d4ee2a85d2205e8b00b