diff --git a/.gitignore b/.gitignore
index 4e7861f..b106efd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,8 @@
 /libabigail-2.0.tar.gz
 /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
diff --git a/libabigail.spec b/libabigail.spec
index ebea98f..ed9d614 100644
--- a/libabigail.spec
+++ b/libabigail.spec
@@ -2,15 +2,16 @@
 %global tarball_name %{name}-%{version}
 
 Name: libabigail
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.5
+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
 
-
+BuildRequires: git
+BuildRequires: libbpf-devel
 BuildRequires: binutils-devel
 BuildRequires: gcc-c++
 BuildRequires: libtool
@@ -19,7 +20,8 @@ BuildRequires: libxml2-devel
 BuildRequires: doxygen
 BuildRequires: python3-sphinx
 BuildRequires: texinfo
-BuildRequires: dos2unix
+BuildRequires: python3-GitPython
+BuildRequires: python3-libarchive-c
 %if 0%{?fedora}
 BuildRequires: dpkg
 BuildRequires: koji
@@ -92,10 +94,10 @@ them manually.
 %endif
 
 %prep
-%setup -n %{tarball_name}
+%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
@@ -113,11 +115,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 # Install man and texinfo files as they are not installed by the
 # default 'install' target of the makefile.
 make -C doc/manuals install-man-and-info-doc DESTDIR=%{buildroot}
-dos2unix doc/manuals/html/_static/jquery.js
 
 %if 0%{?fedora}
 # Explicitly use Python 3 as the interpreter
-pathfix.py -i %{__python3} -pn %{buildroot}%{_bindir}/fedabipkgdiff
+%{py3_shebang_fix} %{buildroot}%{_bindir}/fedabipkgdiff
 %endif
 
 %check
@@ -136,8 +137,9 @@ fi
 %{_bindir}/abilint
 %{_bindir}/abipkgdiff
 %{_bindir}/kmidiff
-%{_libdir}/libabigail.so.1
-%{_libdir}/libabigail.so.1.0.0
+%{_bindir}/abidb
+%{_libdir}/libabigail.so.4
+%{_libdir}/libabigail.so.4.0.0
 %{_libdir}/libabigail/default.abignore
 %doc README AUTHORS ChangeLog
 %license LICENSE.txt license-change-2020.txt
@@ -161,6 +163,48 @@ fi
 %endif
 
 %changelog
+* Thu Apr 17 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.
+- Add git as a build requirement
+
+* Fri Oct 20 2023 Dodji Seketeli <dodji@redhat.com> - 2.4-1
+- Update to upstream 2.4 tarball
+- Enable build with support for BTF
+- Added BuildRequires: libbpf-devel
+- Support soname bumped to libabigail.so.3.0.0
+
+* Thu Apr 27 2023 Dodji Seketeli <dodji@redhat.com> - 2.3-1
+- Update to upstream 2.3 release
+- Don't do "dos2unix doc/manuals/html/_static/jquery.js"
+  The file doc/manuals/html/_static/jquery.js is no more.
+  Hence, don't BuildRequires: dos2unix anymore.
+- The libaigail binary is now libabigail.so.2.0.0.
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 3ed7911..d84e053 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libabigail-2.2.tar.xz) = c512c4a497ea6bb88283feae6c31cf5fe347c260cf1670fe65296bf158d3a2aa449ca518a4f2780e814ffbe6970c7856d2ab91e15499638db78bc52d67d794ce
+SHA512 (libabigail-2.5.tar.xz) = 4084ebdd723a8ce1632f70943e29d71328bb695b1b0012ebd3d6ec7edccde872b54e76dfb1bc1c261805919c5e636198cd5bf23baf113474a082db21f2cfdd0d