diff --git a/s390utils-2.38.0-fedora.patch b/s390utils-2.40.0-fedora.patch
similarity index 100%
rename from s390utils-2.38.0-fedora.patch
rename to s390utils-2.40.0-fedora.patch
diff --git a/s390utils.spec b/s390utils.spec
index d6235bc..7da6a02 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -16,8 +16,8 @@
 
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.38.0
-Release:        2%{?dist}
+Version:        2.40.0
+Release:        1%{?dist}
 Epoch:          2
 # MIT covers nearly all the files, except init files (LGPL-2.1-or-later)
 #
@@ -207,6 +207,7 @@ fi
 
 # move tools to searchable dir
 mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image %{buildroot}%{_bindir}
+mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image.1 %{buildroot}%{_mandir}/man1
 
 mkdir -p %{buildroot}{/boot,%{_udevrulesdir},%{_sysconfdir}/{profile.d,sysconfig},%{_prefix}/lib/modules-load.d}
 install -p -m 644 zipl/boot/tape0.bin %{buildroot}/boot/tape0
@@ -256,10 +257,10 @@ touch %{buildroot}%{_sysconfdir}/zipl.conf
 # install systemd sysusers and tmpfiles
 mkdir -p %{buildroot}{%{_sysusersdir},%{_tmpfilesdir}}/
 for f in s390utils-*.conf.usr; do
-    install -p $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f)
+    install -p -m 644 $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f)
 done
 for f in s390utils-*.conf.tmp; do
-    install -p $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f)
+    install -p -m 644 $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f)
 done
 
 %endif
@@ -288,6 +289,7 @@ done
 %{_bindir}/pvextract-hdr
 %{_bindir}/pvimg
 %{_bindir}/pvsecret
+%{_bindir}/pvverify
 %{_mandir}/man1/genprotimg.1*
 %{_mandir}/man1/pvattest.1*
 %{_mandir}/man1/pvattest-check.1*
@@ -309,7 +311,9 @@ done
 %{_mandir}/man1/pvsecret-retrieve.1*
 %{_mandir}/man1/pvsecret-verify.1*
 %{_mandir}/man1/pvsecret.1*
+%{_mandir}/man1/pvverify.1*
 %dir %{_datadir}/s390-tools
+%{_datadir}/s390-tools/netboot/
 %{_datadir}/s390-tools/pvimg/
 %{bash_completions_dir}/*.bash
 %{zsh_completions_dir}/_*
@@ -331,6 +335,7 @@ License:        MIT
 Summary:        S390 core tools
 Provides:       s390-tools-core = %{epoch}:%{version}-%{release}
 Requires:       coreutils
+Requires:       makedumpfile
 %{?systemd_requires}
 # BRs are covered via the base package
 
@@ -406,6 +411,7 @@ This package provides minimal set of tools needed to system to boot.
 %{_udevrulesdir}/56-dasd.rules
 %{_udevrulesdir}/56-zfcp.rules
 %{_udevrulesdir}/59-dasd.rules
+%{_udevrulesdir}/59-virtio-blk.rules
 %{_udevrulesdir}/60-readahead.rules
 %{_udevrulesdir}/81-ccw.rules
 %{_udevrulesdir}/81-dpm.rules
@@ -639,12 +645,14 @@ For more information refer to the following publications:
 %{_bindir}/cpacfinfo
 %{_bindir}/dump2tar
 %{_bindir}/genprotimg
+%{_bindir}/mk-s390image
 %{_bindir}/pvapconfig
 %{_bindir}/pvimg
-%{_bindir}/mk-s390image
+%{_bindir}/pvinfo
 %{_bindir}/pvattest
 %{_bindir}/pvextract-hdr
 %{_bindir}/pvsecret
+%{_bindir}/pvverify
 %{_bindir}/zkey
 %{_bindir}/zkey-cryptsetup
 %{_bindir}/zpwr
@@ -674,6 +682,7 @@ For more information refer to the following publications:
 %{_mandir}/man1/cpacfinfo.1*
 %{_mandir}/man1/dump2tar.1*
 %{_mandir}/man1/genprotimg.1*
+%{_mandir}/man1/mk-s390image.1*
 %{_mandir}/man1/pvapconfig.1*
 %{_mandir}/man1/pvattest.1*
 %{_mandir}/man1/pvattest-check.1*
@@ -695,6 +704,7 @@ For more information refer to the following publications:
 %{_mandir}/man1/pvsecret-retrieve.1*
 %{_mandir}/man1/pvsecret-verify.1*
 %{_mandir}/man1/pvsecret.1*
+%{_mandir}/man1/pvverify.1*
 %{_mandir}/man1/zkey.1*
 %{_mandir}/man1/zkey-cryptsetup.1*
 %{_mandir}/man1/zkey-ekmfweb.1*
@@ -960,6 +970,7 @@ fi
 %{_mandir}/man1/ts-shell.1*
 %{_mandir}/man7/af_iucv.7*
 %{_mandir}/man8/chiucvallow.8*
+%{_mandir}/man8/lsiucvallow.8*
 %{_mandir}/man9/hvc_iucv.9*
 %{_unitdir}/iucvtty-login@.service
 %{_unitdir}/ttyrun-getty@.service
@@ -1124,6 +1135,12 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Tue Jan 06 2026 Dan Horák <dan[at]danny.cz> - 2:2.40.0-1
+- rebased to 2.40.0 (rhbz#2421447)
+
+* Thu Nov 13 2025 Dan Horák <dan[at]danny.cz> - 2:2.39.0-1
+- rebased to 2.39.0 (rhbz#2403755)
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.38.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index 16b71cb..8572938 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (s390-tools-2.38.0.tar.gz) = 9ca9393e9deeab5c1df5e9eaa3c12e340917ffd5fe07d9a09087d6488d8e2ec0a136805650830d128595854b818a1da94151003e15954e556ba373b226a7369e
-SHA512 (s390-tools-2.38.0-rust-vendor.tar.xz) = c55d2870ad9f90333de2536e7921951185746f0972d5d488bf317b56e754525e4dbd0f63d547229197199b51d41b7032172b6ba7ffacd9a96a01dbd13b9c4d9e
+SHA512 (s390-tools-2.40.0.tar.gz) = 1943429581b280bf9ea370da3700a234d509837cb45b2354cdf79b38db87d2183010d18d9132defd77b9d8e11b7e002c447ffd7c912e20a50da4cb6877758c0e
+SHA512 (s390-tools-2.40.0-rust-vendor.tar.xz) = fd1894c4e950a3c51054432731a3aeef4318e794aa4af2dc5fed31da16dce2020f014a64241e44766fb40b0fd6c1ac5943366e38dcfebf264875220ecf1285b5