diff --git a/.gitignore b/.gitignore
index e54ccfa..846ded9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,8 @@
 /libabigail-2.1.tar.gz
 /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
+/libabigail-2.5.tar.xz
+/libabigail-2.6.tar.xz
diff --git a/libabigail.spec b/libabigail.spec
index 90c913b..a4ca122 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -2,26 +2,27 @@
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 2.3
-Release: 2%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 Summary: Set of ABI analysis tools
 
-License: ASL 2.0
+License: Apache-2.0 WITH LLVM-exception
 URL: https://sourceware.org/libabigail/
 Source0: http://mirrors.kernel.org/sourceware/libabigail/%{tarball_name}.tar.xz
-# fix configure for removal of 'imp' in Python 3.12; code already fixed
-# https://sourceware.org/pipermail/libabigail/2023q3/005581.html
-Patch0: 0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch
-
 
+BuildRequires: git
+BuildRequires: libbpf-devel
 BuildRequires: binutils-devel
 BuildRequires: gcc-c++
 BuildRequires: libtool
 BuildRequires: elfutils-devel
 BuildRequires: libxml2-devel
+BuildRequires: xxhash-devel
 BuildRequires: doxygen
 BuildRequires: python3-sphinx
 BuildRequires: texinfo
+BuildRequires: python3-GitPython
+BuildRequires: python3-libarchive-c
 %if 0%{?fedora}
 BuildRequires: dpkg
 BuildRequires: koji
@@ -94,11 +95,10 @@ them manually.
 %endif
 
 %prep
-%setup -n %{tarball_name}
-%patch -P 0 -p1
+%autosetup -v -S git
 
 %build
-%configure --enable-ctf --disable-silent-rules --disable-zip-archive --disable-static 
+%configure --enable-abidb --enable-ctf --enable-btf --disable-silent-rules --disable-zip-archive --disable-static
 make %{?_smp_mflags}
 pushd doc
 make html-doc
@@ -138,8 +138,9 @@ fi
 %{_bindir}/abilint
 %{_bindir}/abipkgdiff
 %{_bindir}/kmidiff
-%{_libdir}/libabigail.so.2
-%{_libdir}/libabigail.so.2.0.0
+%{_bindir}/abidb
+%{_libdir}/libabigail.so.5
+%{_libdir}/libabigail.so.5.0.0
 %{_libdir}/libabigail/default.abignore
 %doc README AUTHORS ChangeLog
 %license LICENSE.txt license-change-2020.txt
@@ -163,6 +164,53 @@ fi
 %endif
 
 %changelog
+* Fri Nov 1 2024 Dodji Seketeli <dodji@redhat.com> - 2.6-1
+- Update to upstream 2.6 tarball
+- Add xxhash-devel as BuildRequires
+- Update library to libabigail.so.5.0.0
+
+* Thu May 16 2024 Adam Williamson <awilliam@redhat.com> - 2.5-2
+- Rebuild with fixed CI metadata
+
+* Thu Apr 18 2024 Dodji Seketeli <dodji@redhat.com> - 2.5-1
+- Update to upstream 2.5 tarball
+- Drop patches
+  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch
+  0002-suppression-Add-has_strict_flexible_array_data_membe.patch 
+  0003-Replace-deprecated-mock-with-unittest.mock.patch
+- Package libabigail.so.4 rather than the previous libabigail.so.3.
+- Add abidb to the package
+  Added BuildRequires: python3-GitPython, python3-libarchive-c
+- Better handle error handling when tests fails.
+
+* Mon Nov 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-4
+- Fix SPDX licensing string
+
+* Wed Nov 15 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-3
+- Fix sourceware.org/PR31017
+  "Support Flex array conversion suppression"
+  Apply patch 0002-suppression-Add-has_strict_flexible_array_data_membe.patch
+
+* Tue Nov 14 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-2
+- Fix sourceware.org/PR31045
+  "Don't try setting translation unit for unique types"
+  Apply patch
+  0001-Bug-31045-Don-t-try-setting-translation-unit-for-uni.patch.
+  That patch is applied in upstream mainline and will be available in
+  libabigail 2.5.
+- Use %autosetup instead of the previous %setup and %patch macros.
+- Use SPDX licensing reference
+- Add git as a build requirement
+
+* Fri Oct 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
+- Update to upstream 2.4 tarball
+- Drop patches
+  0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch and
+  0001-Fix-fedabipkgdiff-configure-check-for-Python-3.12.patch
+- Enable build with support for BTF
+- Added BuildRequires: libbpf-devel
+- Support soname bumped to libabigail.so.3.0.0
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/plans/ci.fmf b/plans/ci.fmf
index 1ad2c12..3fd3ab7 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,6 +1,5 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    directory: tests
 execute:
-    how: beakerlib
+    how: tmt
diff --git a/sources b/sources
index f60b327..3146d43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libabigail-2.3.tar.xz) = fdf0df51e2c262c723c11bef58cd0b89b27e67be196edeb33444fc06e7e61d3c2c227f59cb961aea6fc0c9b7f6f04e08b787a1cbbeb3d5507b968b8ae7630527
+SHA512 (libabigail-2.6.tar.xz) = 77983586c9fa99ab5593e41e33ddfc175aef7a2ddfabb7eac79a9adfd776e7dbbb317f6d4c26044c420f2eac1f9d25e0c04887a54bb3136cc91e61219a1343e4
diff --git a/tests/libabigail-testsuite/runtest.sh b/tests/libabigail-testsuite/runtest.sh
index 4b69b8b..f387b16 100755
--- a/tests/libabigail-testsuite/runtest.sh
+++ b/tests/libabigail-testsuite/runtest.sh
@@ -55,6 +55,7 @@ rlJournalStart
     rlRun "yum-builddep -y $TmpDir/SPECS/*.spec"
     rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bc $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER"
     rlRun "rlFileSubmit $TmpDir/rpmbuild.log"
+    rlRun "rm -rf $TmpDir/BUILD/libabigail-*-SPECPARTS"
     rlRun "cd $TmpDir/BUILD/libabigail-*"
   rlPhaseEnd