diff --git a/.dwarves.metadata b/.dwarves.metadata
new file mode 100644
index 0000000..1de0894
--- /dev/null
+++ b/.dwarves.metadata
@@ -0,0 +1 @@
+251fc1ff6b0f953f565f74c25c8aa55e7f8c50d9 dwarves-1.25.tar.xz
diff --git a/.gitignore b/.gitignore
index 660929c..e083fc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /dwarves-1.22.tar.xz
 /dwarves-1.24.tar.xz
 /0001-dwarves-Zero-initialize-struct-cu-in-cu__new-to-prev.patch
+/dwarves-1.25.tar.xz
diff --git a/dwarves.spec b/dwarves.spec
index c540944..994d10d 100644
--- a/dwarves.spec
+++ b/dwarves.spec
@@ -2,14 +2,13 @@
 %define libver 1
 
 Name: dwarves
-Version: 1.24
-Release: 2%{?dist}
+Version: 1.25
+Release: 1%{?dist}
 License: GPLv2
 Summary: Debugging Information Manipulation Tools (pahole & friends)
 URL: http://acmel.wordpress.com
 Source: http://fedorapeople.org/~acme/dwarves/%{name}-%{version}.tar.xz
 Requires: %{libname}%{libver} = %{version}-%{release}
-Patch1: 0001-dwarves-Zero-initialize-struct-cu-in-cu__new-to-prev.patch
 BuildRequires: gcc
 BuildRequires: cmake >= 2.8.12
 BuildRequires: zlib-devel
@@ -67,7 +66,6 @@ Debugging information processing library development files.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %cmake -DCMAKE_BUILD_TYPE=Release -DLIBBPF_EMBEDDED=Off .
@@ -82,8 +80,7 @@ rm -Rf %{buildroot}
 %files
 %doc README.ctracer
 %doc README.btf
-%doc changes-v1.23
-%doc changes-v1.24
+%doc changes-v1.25
 %doc NEWS
 %{_bindir}/btfdiff
 %{_bindir}/codiff
@@ -135,6 +132,20 @@ rm -Rf %{buildroot}
 %{_libdir}/%{libname}_reorganize.so
 
 %changelog
+* Wed Jun 14 2023 Viktor Malik <vmalik@redhat.com> - 1.25-1
+- Resolves: rhbz#2190484
+- Build with system libbpf
+- New release: v1.25
+- Support for DW_TAG_unspecified_type more generally.
+- Make sure struct member offsets are in ascending order. Rust BTF needs this.
+- Support C atomic types (DW_TAG_atomic_type).
+- Initial support for DW_TAG_LLVM_annotation, used for BTF type tags, for __rcu, __user, etc
+- Exclude functions with the same name (static functions in different CUs), inconsistent prototypes or not following calling convention.
+- Allow generation of BTF for optimized functions, those that end with a .isra*, .constprop*.
+- Support 'pahole --lang=/--lang_exclude=asm'
+- Support --compile from DWARF in addition to from BTF.
+- Exclude RUST CUs in 'btfdiff', as those are not yet being BTF encoded.
+
 * Wed Nov 16 2022 Viktor Malik <vmalik@redhat.com> - 1.24-2
 - Backport BTF fix needed for kernel kfuncs
 - Related: rhbz#2140020
diff --git a/sources b/sources
index 54f206b..7384339 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (0001-dwarves-Zero-initialize-struct-cu-in-cu__new-to-prev.patch) = 4f82cc1f1a7162449fdef8c47f0bc2c9ab5c8966340cc7c30570274e5526f3f95421b13daae6efc7f1c7608f728d74588b6c14637a0d341b191db11c363f760a
-SHA512 (dwarves-1.24.tar.xz) = 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
+SHA512 (dwarves-1.25.tar.xz) = 104bfb8712d863e04d0c827c008b23ebc49543b17bfb5b44ce276a5b3d39f12cf71f721055ae2e5f430aa77a3c70f85f6eeaf72fd8c1cdf547260488bc5b5070