diff --git a/.gitignore b/.gitignore
index d6912bc..ed5d48e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-2.4.3.tar.xz
+/cryptsetup-2.5.0-rc1.tar.xz
diff --git a/cryptsetup-2.4.3.tar.sign b/cryptsetup-2.4.3.tar.sign
deleted file mode 100644
index 73478ec..0000000
--- a/cryptsetup-2.4.3.tar.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmHf9akACgkQ2bBXe9k+
-mPz0zw//cqAJh3wE0zxtfb+2al4cH2oTtPR+/VnnW8s5z9hyBztNZo8ChOXEQqEQ
-3l+S0qvJSkCmQT2RNEAdyqMjolU3NKKYi+iZwKUfcYPAABnc0/df9p1l4ykKYmuZ
-6EiQCCZITrFkiRl0jVsZ/U92FAU+EdI7dXPVr+H8Ai6eA4HW3NIrZlsUUMdsmkCE
-6eqSX3WX1WVpFkv3453JSNG5/byHP4iPEnXdy00+n5qDoWrOEqDL6MDFaljBS2gq
-XKIeDfKTe3tQAelPEnIc/Is5Tus2uMkxn+bW9KPviS3tOSW5iDVUNL2DBVdMcuxV
-e26mEud9BYyKvajj3wP2TR/BD+ctmwnYSLrfs8aMzE109YI2NuxHD6sWI9d2jrtx
-2fMDV20AKGvvt2q4RkIqAkML7S1RQUVdma33I/iBojFu4bXleLBUcwi1vT+G1NMX
-rz+bVo5zKa7bfTjjX/T8ATL302Lhpr3yReAR6m2KqX3xbxinwG3BV88fyZjJEFft
-zW2JYT3gntkp7GqrxMWjZYNc8AAcpRcabXqb/7NcCBPmS33Kk+/eQiBGEQCw85g7
-MQk7oLKFKT31yJ0TipJExWLOpaWR592wBMl/vx3jAyJjWR1IxajzKD60ZNJHavsn
-5PCPtLxXGdbyyagI45Jm1Pa6Me0vcXzYSHnYdPy5tprOfJgzMT4=
-=yURq
------END PGP SIGNATURE-----
diff --git a/cryptsetup-2.5.0-rc1.tar.sign b/cryptsetup-2.5.0-rc1.tar.sign
new file mode 100644
index 0000000..94b158c
--- /dev/null
+++ b/cryptsetup-2.5.0-rc1.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmLQJB4ACgkQ2bBXe9k+
+mPzechAApt7SCkdiPyi4i7tud/KyQRJ5A6mGaCU0Zfm2G3TVioEF7NSQL6YiZK4X
+kB20dt+ycY7vKFiEDHWKaBVZc0BXiOw8Byvf/uFE6DHF3+rAHTTf5MKKaq8vL324
+xAVGGL41plhJlrEhzNNtYUBa0oG/2qcXy4EFtonr1HgnPvDVpS78Wmq5XgdZCN9f
+kiKlohVFDSXll1IQEa3WrfIu5w0LYe5kIdCYFJ8Q2R/8TVhiZkC5QnpCLbbVZnD0
+R81VNINU7O5ibG4PdOSmzUa+idYfwlDUZwphx01TerK69e7fP8WQJ/7XtiKRbErl
+0Rm3fVtrNGI4+F/k4lV1N6/N0im7XJFidfriNuO9E6TPbsBqa8dhmpfrM/XQfgQB
+jrzZ2sONl3ZKzaHxXC5Q1SzfMszqAhcPydRbUf4w+YTBzMy5xkbmv6SfGnijAqX7
+9J8/+4g2HYJQCtgWgP4PvDioK7WKWLsvzcR+AbQgzrpyfNIUXSZx7lUXgevKbFJd
+8uDKv5v6ZmqYO4Uk/04HiJ/KrBxORRefEhhTEN+FrMWMdsyKumFUn+FEeovpvlNn
+CV+OYCdRpyqCti6dVDh/Zv4rhmUxuOVPcSXafduGsnauxemHCCuQ8LkXlqctFEVD
+3jRJKiahECIu31b8muJF2z2gkI5BJlDpbkPdiaixJlybITK+kzY=
+=kKNv
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 38f8a21..248cea5 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,7 +1,7 @@
 Summary: Utility for setting up encrypted disks
 Name: cryptsetup
-Version: 2.4.3
-Release: 2%{?dist}
+Version: 2.5.0~rc1
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: autoconf, automake, libtool, gettext-devel,
@@ -9,11 +9,14 @@ BuildRequires: openssl-devel, popt-devel, device-mapper-devel
 BuildRequires: libuuid-devel, gcc, json-c-devel, libargon2-devel
 BuildRequires: libpwquality-devel, libblkid-devel
 BuildRequires: make libssh-devel
+BuildRequires: asciidoctor
 Requires: cryptsetup-libs = %{version}-%{release}
 Requires: libpwquality >= 1.2.0
+Obsoletes: %{name}-reencrypt <= %{version}
+Provides: %{name}-reencrypt = %{version}
 
 %global upstream_version %{version_no_tilde}
-Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-%{upstream_version}.tar.xz
+Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v2.5/cryptsetup-%{upstream_version}.tar.xz
 
 %description
 The cryptsetup package contains a utility for setting up
@@ -57,20 +60,15 @@ Requires: cryptsetup-libs = %{version}-%{release}
 The integritysetup package contains a utility for setting up
 disk integrity protection using dm-integrity kernel module.
 
-%package reencrypt
-Summary: A utility for offline reencryption of LUKS encrypted disks
-Requires: cryptsetup-libs = %{version}-%{release}
-
-%description reencrypt
-This package contains cryptsetup-reencrypt utility which
-can be used for offline reencryption of disk in situ.
-
 %prep
 %autosetup -n cryptsetup-%{upstream_version} -p 1
 
 %build
+# force regeneration of manual pages from AsciiDoc
+rm -f man/*.8
+
 ./autogen.sh
-%configure --enable-fips --enable-pwquality --enable-libargon2
+%configure --enable-fips --enable-pwquality --enable-libargon2 --enable-asciidoc
 %make_build
 
 %install
@@ -84,8 +82,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la
 
 %files
 %license COPYING
-%doc AUTHORS FAQ docs/*ReleaseNotes
+%doc AUTHORS FAQ.md docs/*ReleaseNotes
 %{_mandir}/man8/cryptsetup.8.gz
+%{_mandir}/man8/cryptsetup-*.8.gz
 %{_sbindir}/cryptsetup
 
 %files -n veritysetup
@@ -98,11 +97,6 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la
 %{_mandir}/man8/integritysetup.8.gz
 %{_sbindir}/integritysetup
 
-%files reencrypt
-%license COPYING
-%{_mandir}/man8/cryptsetup-reencrypt.8.gz
-%{_sbindir}/cryptsetup-reencrypt
-
 %files devel
 %doc docs/examples/*
 %{_includedir}/libcryptsetup.h
@@ -123,6 +117,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/*.la
 %{_sbindir}/cryptsetup-ssh
 
 %changelog
+* Thu Jul 14 2022 Ondrej Kozina <okozina@redhat.com> - 2.5.0~rc1-1
+- Update to cryptsetup 2.5.0-rc1.
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index f831562..be9190f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cryptsetup-2.4.3.tar.xz) = 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
+SHA512 (cryptsetup-2.5.0-rc1.tar.xz) = 85e63ee1758bd15120682937309fedb70c11c4254f42cc300e36bacce1a23b02dce27395c6b497793cff6922fb1266ce35f5b9dbfe3740639e694d23c6bb37b2