diff --git a/.gitignore b/.gitignore
index 400d3de..bd6f6d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /percona-xtrabackup-7686bfc6e5a5163f73e2adea38eac0da06c9898e.tar.gz
 /percona-xtrabackup-8.0.14.tar.gz
 /boost_1_72_0.tar.gz
+/percona-xtrabackup-8.0.25_17.tar.gz
+/boost_1_73_0.tar.gz
diff --git a/percona-xtrabackup.spec b/percona-xtrabackup.spec
index 7751583..0025ce3 100644
--- a/percona-xtrabackup.spec
+++ b/percona-xtrabackup.spec
@@ -1,18 +1,16 @@
-%global commit 113f3d74e3aa1a2907a7015a6029acc97521a9eb
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 %global pxbu_major_minor 80
 
 %define _lto_cflags %{nil}
 
 Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB
 Name: percona-xtrabackup
-Version: 8.0.14
-Release: 3%{?dist}
+Version: 8.0.25_17
+Release: 1%{?dist}
 License: GPLv2 and Boost and MIT and Python
 URL: http://www.percona.com/software/percona-xtrabackup/
-Source: https://github.com/percona/%{name}/archive/%{commit}/%{name}-%{version}.tar.gz
-Source1: boost_1_72_0.tar.gz
+# Real name is 8.0.25-17 ...
+Source: https://github.com/percona/%{name}/archive/refs/tags/%{name}-8.0.25_17.tar.gz
+Source1: boost_1_73_0.tar.gz
 Provides: xtrabackup >= 2.0.0
 Provides: %{name}-%{pxbu_major_minor}
 Obsoletes: xtrabackup < 2.0.0
@@ -54,7 +52,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This package contains the test suite for Percona Xtrabackup
 
 %prep
-%setup -qn %{name}-%{version}
+%setup -qn %{name}-8.0.25-17
 mkdir -p %{_build}/../libboost
 cp %SOURCE1 %{_build}/../libboost/
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . ./storage/innobase/xtrabackup/test/subunit2junitxml
@@ -89,18 +87,22 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/usr/lib64/xtrabackup/plugin
 %{_bindir}/xbcrypt
 %{_bindir}/xbcloud
 %{_bindir}/xbcloud_osenv
-%doc README VERSION XB_VERSION
+%doc README XB_VERSION
 %license LICENSE
 %{_mandir}/man1/xtrabackup.1.gz
 %{_mandir}/man1/xbstream.1.gz
 %{_mandir}/man1/xbcrypt.1.gz
 %{_libdir}/xtrabackup/plugin/keyring_file.so
 %{_libdir}/xtrabackup/plugin/keyring_vault.so
+%{_libdir}/xtrabackup/plugin/component_keyring_file.so
 
 %files -n percona-xtrabackup-test
 %{_datadir}/percona-xtrabackup-test-%{pxbu_major_minor}
 
 %changelog
+* Sat Jul 31 2021 Sven Lankes <sven@lank.es> - 8.0.25_17-1
+- rebase to latest upstream release
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 74a3ad9..9f362ef 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (percona-xtrabackup-8.0.14.tar.gz) = dc34af1c7565ec8bf0ebd58b27f13256a238d9a964c8407f14afd95eb51e231e867934594174af8b51eacd4f801c9fc2694a9e5024e33f9ed2223cf58f1a0f8a
-SHA512 (boost_1_72_0.tar.gz) = 318f655a3ccf001c3ba3a5c166dba002770c506b4269f3533ff8354508fc1b62b2c451d3032b6e686456f94708cfc58e04202f149aee734bbdefe50c4cb0c297
+SHA512 (percona-xtrabackup-8.0.25_17.tar.gz) = f7186881c8422f6802efb813644c5721bb274db54afb591b58fe9ee1a084fba6546c7673f461b4d581c01ff0cbda588cb96b7fe21d669b3d9cbe3b5898288e08
+SHA512 (boost_1_73_0.tar.gz) = 19347e3263e246c0224678e1ffecd1b38e87006f135d6bc8efd798c6f7236bc95b29306c105f0182eea5839d6461850a40c70f8f88e9fd5874442fe4ec31eef7