diff --git a/.gitignore b/.gitignore
index 7a88321..4b33380 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ src_vipa-2.0.4.tar.gz
 /src_vipa-2.1.0.tar.gz
 /s390-tools-*.tar.bz2
 /s390-tools-*.tar.gz
+/s390-tools-*-rust-vendor.tar.xz
diff --git a/20-zipl-kernel.install b/20-zipl-kernel.install
index 3487aa2..8cb8d86 100755
--- a/20-zipl-kernel.install
+++ b/20-zipl-kernel.install
@@ -54,21 +54,25 @@ EOF
 case "$COMMAND" in
     add)
         if [[ "${KERNEL_DIR}" != "/boot" ]]; then
+            # rename to match the name used in the pseudo-BLS snippet above
+            cp --remove-destination --preserve=timestamps -T "${KERNEL_IMAGE}" "/boot/vmlinuz-${KERNEL_VERSION}"
+            command -v restorecon &>/dev/null && \
+                restorecon -R "/boot/vmlinuz-${KERNEL_VERSION}"
+
             for i in \
-                "$KERNEL_IMAGE" \
                     "$KERNEL_DIR"/System.map \
                     "$KERNEL_DIR"/config \
                     "$KERNEL_DIR"/zImage.stub
             do
                 [[ -e "$i" ]] || continue
-                cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
+                cp --preserve=timestamps -T "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
                 command -v restorecon &>/dev/null && \
                     restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
             done
             # hmac is .vmlinuz-<version>.hmac so needs a special treatment
             i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
             if [[ -e "$i" ]]; then
-                cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
+                cp --preserve=timestamps "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
                 command -v restorecon &>/dev/null && \
                     restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
             fi
@@ -88,16 +92,10 @@ case "$COMMAND" in
                 done
             fi
 
-            if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-                echo "Could not determine the kernel command line parameters." >&2
-                echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-                exit 1
-            fi
-
             [[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
             if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
-                cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
+                cp --preserve=timestamps -T "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
                 sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
                 sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
                 sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
@@ -118,7 +116,7 @@ case "$COMMAND" in
 
             if [ "x${MAKEDEBUG}" = "xyes" ]; then
                 BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
-                cp -aT  "${BLS_TARGET}" "${BLS_DEBUG}"
+                cp --preserve=timestamps -T  "${BLS_TARGET}" "${BLS_DEBUG}"
                 TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
 		VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
                 BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
diff --git a/52-zipl-rescue.install b/52-zipl-rescue.install
index dbf0c1b..8acfbe0 100755
--- a/52-zipl-rescue.install
+++ b/52-zipl-rescue.install
@@ -29,12 +29,6 @@ case "$COMMAND" in
                 done
             fi
 
-            if ! [[ ${BOOT_OPTIONS[*]} ]]; then
-                echo "Could not determine the kernel command line parameters." >&2
-                echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
-                exit 1
-            fi
-
             BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
             if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
                sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
diff --git a/ccw.udev b/ccw.udev
index 8ef72db..c5db932 100644
--- a/ccw.udev
+++ b/ccw.udev
@@ -1,4 +1,4 @@
-ACTION!="bind", GOTO="ccw_end"
+ACTION!="add|bind|change", GOTO="ccw_end"
 SUBSYSTEM!="ccw", GOTO="ccw_end"
 DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
 LABEL="ccw_end"
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..7e19000
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,9 @@
+---
+pathmigration:
+    excluded_paths:
+        - /lib/s390-tools
+
+badfuncs:
+    allowed:
+        /usr/bin/qethqoat:
+            - inet_ntoa
diff --git a/s390-tools-zipl-blscfg-rpm-nvr-sort.patch b/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
index d69192f..366efba 100644
--- a/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
+++ b/s390-tools-zipl-blscfg-rpm-nvr-sort.patch
@@ -1,19 +1,234 @@
-diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/Makefile
---- s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort	2019-05-22 08:16:17.317273801 -0400
-+++ s390-tools-2.9.0/zipl/src/Makefile	2019-05-22 08:18:02.947273801 -0400
-@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
- 	    -D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
- ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 20 Jun 2022 17:43:05 +0200
+Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
+ versions"
+
+This reverts commit a0dba6bfdb50ff373fa710ffe2a307cc0748f18b.
+---
+ zipl/src/scan.c | 139 ++----------------------------------------------
+ 1 file changed, 3 insertions(+), 136 deletions(-)
+
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 0cea1d4..9352f76 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -10,7 +10,6 @@
+  *
+  */
  
--libs = $(rootdir)/libutil/libutil.a
-+libs = $(rootdir)/libutil/libutil.a -lrpmio -lrpm
+-static const char *VERSION_KEYWORD = "version";
  
- objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
- 	  install.o zipl.o $(rootdir)/zipl/boot/data.o
-diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/scan.c
---- s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort	2019-05-21 09:13:36.000000000 -0400
-+++ s390-tools-2.9.0/zipl/src/scan.c	2019-05-22 08:16:17.317273801 -0400
-@@ -33,6 +33,8 @@
+ /* Need ISOC99 function isblank() in ctype.h */
+ #ifndef __USE_ISOC99
+@@ -646,7 +645,7 @@ scan_file(const char* filename, struct scan_token** token)
+ 
+ 
+ static int
+-bls_filter_by_names(const struct dirent *ent)
++bls_filter(const struct dirent *ent)
+ {
+ 	int offset = strlen(ent->d_name) - strlen(".conf");
+ 
+@@ -656,111 +655,13 @@ bls_filter_by_names(const struct dirent *ent)
+ 	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
+ }
+ 
+-struct version {
+-	char *line; /* pointer to a line with version keyword */
+-	int offset; /* offset of version value in the line */
+-};
+-
+-/*
+- * Locate version in bls file represented by ENT
+- */
+-static void get_version(const struct dirent *ent, struct version *v)
+-{
+-	char *line = NULL;
+-	size_t len = 0;
+-	char *d_name;
+-	FILE *stream;
+-	ssize_t read;
+-
+-	memset(v, 0, sizeof(*v));
+-	d_name = misc_make_path((char *)blsdir, (char *)ent->d_name);
+-	if (!d_name)
+-		return;
+-
+-	stream = fopen(d_name, "r");
+-	free(d_name);
+-	if (!stream)
+-		return;
+-
+-	while ((read = getline(&line, &len, stream)) != -1) {
+-		if (line[read - 1] == '\n') {
+-			line[read - 1] = '\0';
+-			read--;
+-		}
+-		if ((size_t)read <= strlen(VERSION_KEYWORD) + 1)
+-			continue;
+-		if (strcmp(VERSION_KEYWORD, line) > 0)
+-			continue;
+-		if (!isblank(line[strlen(VERSION_KEYWORD)]))
+-			continue;
+-		/* skip blanks */
+-		v->offset = strlen(VERSION_KEYWORD) + 1;
+-		while (v->offset < read - 1 && isblank(line[v->offset]))
+-			v->offset++;
+-		if (isblank(line[v->offset]))
+-			/*
+-			 * all characters after the keyword
+-			 * are blanks. Invalid version
+-			 */
+-			continue;
+-		v->line = line;
+-		fclose(stream);
+-		return;
+-	}
+-	free(line);
+-	fclose(stream);
+-}
+-
+-static void put_version(struct version *v)
+-{
+-	free(v->line);
+-}
+-
+-/**
+- * Check version in bls file represented by ENT.
+- * Return 1 if version is valid. Otherwise return 0
+- */
+-static int bls_filter_by_versions(const struct dirent *ent)
+-{
+-	struct version v;
+-
+-	if (bls_filter_by_names(ent) == 0)
+-		return 0;
+-
+-	get_version(ent, &v);
+-	if (v.line) {
+-		put_version(&v);
+-		return 1;
+-	}
+-	return 0;
+-}
+-
+ 
+ static int
+-bls_sort_by_names(const struct dirent **ent_a, const struct dirent **ent_b)
++bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
+ {
+ 	return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
+ }
+ 
+-static int
+-bls_sort_by_versions(const struct dirent **ent_a, const struct dirent **ent_b)
+-{
+-	struct version v1, v2;
+-	int ret;
+-
+-	get_version(*ent_a, &v1);
+-	get_version(*ent_b, &v2);
+-	/*
+-	 * Both versions are valid.
+-	 * It is guaranteed by bls_filter_by_versions()
+-	 */
+-	ret = strverscmp(v1.line + v1.offset, v2.line + v2.offset);
+-
+-	put_version(&v1);
+-	put_version(&v2);
+-
+-	return ret;
+-}
+ 
+ static int
+ scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+@@ -1110,40 +1011,6 @@ scan_count_target_keywords(char* keyword[])
+ 	return num;
+ }
+ 
+-static int bls_scandir(struct dirent ***bls_entries)
+-{
+-	struct dirent **entries1;
+-	struct dirent **entries2;
+-	int n1, n2;
+-
+-	/* arrange by names */
+-	n1 = scandir(blsdir, &entries1,
+-		     bls_filter_by_names, bls_sort_by_names);
+-	if (n1 <= 0)
+-		return n1;
+-	/* arrange by versions */
+-	n2 = scandir(blsdir, &entries2,
+-		     bls_filter_by_versions, bls_sort_by_versions);
+-
+-	if (n2 <= 0 || n2 < n1) {
+-		/*
+-		 * failed to sort by versions,
+-		 * fall back to sorting by filenames
+-		 */
+-		*bls_entries = entries1;
+-		while (n2--)
+-			free(entries2[n2]);
+-		free(entries2);
+-		return n1;
+-	}
+-	/* use arrangement by versions */
+-	*bls_entries = entries2;
+-	while (n1--)
+-		free(entries1[n1]);
+-	free(entries1);
+-	return n2;
+-}
+-
+ int
+ scan_check_target_data(char* keyword[], int* line)
+ {
+@@ -1464,7 +1331,7 @@ int scan_bls(struct scan_token **token, int scan_size)
+ 	if (!(stat(blsdir, &sb) == 0 && S_ISDIR(sb.st_mode)))
+ 		return 0;
+ 
+-	n = bls_scandir(&bls_entries);
++	n = scandir(blsdir, &bls_entries, bls_filter, bls_sort);
+ 	if (n <= 0)
+ 		return n;
+ 
+-- 
+2.39.2
+
+
+From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Mon, 20 Jun 2022 17:46:59 +0200
+Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Signed-off-by: Dan Horák <dan@danny.cz>
+---
+ zipl/src/Makefile |  1 +
+ zipl/src/scan.c   | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 95 insertions(+), 2 deletions(-)
+
+diff --git a/zipl/src/Makefile b/zipl/src/Makefile
+index cab5655..7ec215d 100644
+--- a/zipl/src/Makefile
++++ b/zipl/src/Makefile
+@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
+ 
+ libs =  $(rootdir)/libutil/libutil.a \
+ 	$(rootdir)/libvtoc/libvtoc.a \
++	-lrpmio -lrpm
+ 
+ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
+ 	  bootmap_header.o envblk.o install.o zipl.o
+diff --git a/zipl/src/scan.c b/zipl/src/scan.c
+index 9352f76..3327e2d 100644
+--- a/zipl/src/scan.c
++++ b/zipl/src/scan.c
+@@ -35,6 +35,8 @@
  
  #include "lib/util_base.h"
  
@@ -22,7 +237,7 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
  #include "boot.h"
  #include "error.h"
  #include "misc.h"
-@@ -653,13 +655,103 @@ bls_filter(const struct dirent *ent)
+@@ -655,13 +657,103 @@ bls_filter(const struct dirent *ent)
  	return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
  }
  
@@ -128,3 +343,6 @@ diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/z
  
  static int
  scan_append_section_heading(struct scan_token* scan, int* index, char* name);
+-- 
+2.39.2
+
diff --git a/s390-tools-zipl-invert-script-options.patch b/s390-tools-zipl-invert-script-options.patch
index 93d5cc7..d7d936f 100644
--- a/s390-tools-zipl-invert-script-options.patch
+++ b/s390-tools-zipl-invert-script-options.patch
@@ -61,10 +61,10 @@ index 871935c783f..d8d5eca5867 100755
  	    ;;
  	--)
  	    shift
-diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.1
+diff --git a/scripts/zipl-switch-to-blscfg.8 b/scripts/zipl-switch-to-blscfg.8
 index 6bd14d00d14..71b904ffd1c 100644
---- a/scripts/zipl-switch-to-blscfg.1
-+++ b/scripts/zipl-switch-to-blscfg.1
+--- a/scripts/zipl-switch-to-blscfg.8
++++ b/scripts/zipl-switch-to-blscfg.8
 @@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
  The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
  
diff --git a/s390utils-2.40.0-fedora.patch b/s390utils-2.40.0-fedora.patch
new file mode 100644
index 0000000..e69de29
diff --git a/s390utils.spec b/s390utils.spec
index e9b0e0e..7da6a02 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -1,17 +1,57 @@
 # secure boot support is for RHEL only
 %if 0%{?rhel} >= 8
-%global signzipl 1
+%bcond_without signzipl
+%else
+%bcond_with signzipl
 %endif
 
+%if 0%{?fedora}
+%bcond_without pandoc
+%else
+%bcond_with pandoc
+%endif
+
+# Also controls whether %%cargo_generate_buildrequires generates dev-dependencies
+%bcond_without check
+
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
-Version:        2.17.0
-Release:        2%{?dist}
+Version:        2.40.0
+Release:        1%{?dist}
 Epoch:          2
-License:        MIT
-ExclusiveArch:  s390 s390x
+# MIT covers nearly all the files, except init files (LGPL-2.1-or-later)
+#
+# Statically-linked Rust dependencies contribute additional license terms,
+# listed in the output of %%{cargo_license_summary}:
+#
+# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR MIT
+# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSD-2-Clause OR Apache-2.0 OR MIT
+# MIT
+# MIT OR Apache-2.0
+# Unlicense OR MIT
+%global extra_licenses_from_rust_deps %{shrink:
+Apache-2.0 AND
+(Apache-2.0 OR BSL-1.0) AND
+(Apache-2.0 OR MIT) AND
+(Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
+(BSD-2-Clause OR Apache-2.0 OR MIT) AND
+Unicode-DFS-2016 AND
+(Unlicense OR MIT)
+}
+License:        MIT AND LGPL-2.1-or-later AND %{extra_licenses_from_rust_deps}
 URL:            https://github.com/ibm-s390-linux/s390-tools
 Source0:        https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
+# To create the vendor tarball:
+#   tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust ; \
+#   rm -f Cargo.lock && cargo vendor && \
+#   tar Jvcf ../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
+%if 0%{?rhel}
+Source1:        s390-tools-%{version}-rust-vendor.tar.xz
+%endif
 Source5:        https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
 Source7:        https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
 Source12:       https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
@@ -25,7 +65,7 @@ Source23:       20-zipl-kernel.install
 Source24:       52-zipl-rescue.install
 Source25:       91-zipl.install
 
-%if 0%{?signzipl}
+%if %{with signzipl}
 %define pesign_name redhatsecureboot302
 %endif
 
@@ -33,6 +73,19 @@ Source25:       91-zipl.install
 Patch0:         s390-tools-zipl-invert-script-options.patch
 Patch1:         s390-tools-zipl-blscfg-rpm-nvr-sort.patch
 
+# upstream fixes/updates
+#Patch100:       s390utils-%%{version}-fedora.patch
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}
+
+# Add Provides for upstream name
+Provides:       s390-tools = %{epoch}:%{version}-%{release}
+
+%ifarch s390x
+#
+# s390x/native package structure
+#
 Requires:       s390utils-core = %{epoch}:%{version}-%{release}
 Requires:       s390utils-base = %{epoch}:%{version}-%{release}
 Requires:       s390utils-osasnmpd = %{epoch}:%{version}-%{release}
@@ -40,9 +93,23 @@ Requires:       s390utils-cpuplugd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-mon_statd = %{epoch}:%{version}-%{release}
 Requires:       s390utils-iucvterm = %{epoch}:%{version}-%{release}
 Requires:       s390utils-ziomon = %{epoch}:%{version}-%{release}
+%else
+#
+# multiarch package structure
+#
+Requires:       s390utils-se-data = %{epoch}:%{version}-%{release}
+%endif
 
 BuildRequires:  make
 BuildRequires:  gcc-c++
+BuildRequires:  glib2-devel
+%if 0%{?rhel}
+BuildRequires:  libcurl-devel
+BuildRequires:  openssl-devel
+BuildRequires:  rust-toolset
+%else
+BuildRequires:  cargo-rpm-macros >= 24
+%endif
 
 %description
 This is a meta package for installing the default s390-tools sub packages.
@@ -53,36 +120,81 @@ The s390utils packages contain a set of user space utilities that should to
 be used together with the zSeries (s390) Linux kernel and device drivers.
 
 %prep
-%setup -q -n s390-tools-%{version}
+%autosetup -n s390-tools-%{version} -p1
 
-# Fedora/RHEL changes
-%patch0 -p1 -b .zipl-invert-script-options
-%patch1 -p1 -b .blscfg-rpm-nvr-sort
+%if 0%{?rhel}
+pushd rust
+tar xf %{SOURCE1}
+%cargo_prep -v vendor
+popd
+%else
+%cargo_prep
+%endif
+rm ./rust/Cargo.lock
 
-# remove --strip from install
-find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
+# Create sysusers config files
+echo 'g zkeyadm' > s390utils-base.conf.usr
+echo 'g ts-shell' > s390utils-iucvterm.conf.usr
+echo 'g cpacfstats' > s390utils-cpacfstatsd.conf.usr
 
+# Create tmpfiles config files
+echo 'd /var/log/ts-shell 2770 root ts-shell' > s390utils-iucvterm.conf.tmp
+
+%if !0%{?rhel}
+%generate_buildrequires
+pushd rust >/dev/null
+%cargo_generate_buildrequires
+popd >/dev/null
+%endif
 
 %build
 make \
-        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" \
+        CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
+        HAVE_DRACUT=1 \
+%if %{with pandoc}
+        ENABLE_DOC=1 \
+%endif
         NO_PIE_LDFLAGS="" \
+%if "%{_sbindir}" == "%{_bindir}"
+        BINDIR=/usr/bin \
+        USRSBINDIR=/usr/bin \
+%else
         BINDIR=/usr/sbin \
+%endif
         DISTRELEASE=%{release} \
         V=1
 
+pushd rust
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%if 0%{?rhel}
+%cargo_vendor_manifest
+%endif
+popd
+
 
 %install
-make install \
+%make_install \
         HAVE_DRACUT=1 \
-        DESTDIR=%{buildroot} \
+%if %{with pandoc}
+        ENABLE_DOC=1 \
+%endif
+%if "%{_sbindir}" == "%{_bindir}"
+        BINDIR=/usr/bin \
+        USRSBINDIR=/usr/bin \
+%else
         BINDIR=/usr/sbin \
+%endif
         SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
         DISTRELEASE=%{release} \
         V=1
 
+%ifarch s390x
+#
+# s390x/native specific %%install section
+#
 # sign the stage3 bootloader
-%if 0%{?signzipl}
+%if %{with signzipl}
 if [ -x /usr/bin/rpm-sign ]; then
     pushd %{buildroot}/lib/s390-tools/
         rpm-sign --key "%{pesign_name}" --lkmsign stage3.bin --output stage3.signed
@@ -95,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
@@ -141,17 +254,88 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
 # zipl.conf to be ghosted
 touch %{buildroot}%{_sysconfdir}/zipl.conf
 
+# install systemd sysusers and tmpfiles
+mkdir -p %{buildroot}{%{_sysusersdir},%{_tmpfilesdir}}/
+for f in s390utils-*.conf.usr; do
+    install -p -m 644 $f %{buildroot}%{_sysusersdir}/$(basename -s .usr $f)
+done
+for f in s390utils-*.conf.tmp; do
+    install -p -m 644 $f %{buildroot}%{_tmpfilesdir}/$(basename -s .tmp $f)
+done
 
+%endif
+
+%ifarch s390x
+#
+# s390x/native main %%files section
+#
 %files
 %doc README.md
 
+%else
+#
+# multiarch %%files section
+#
+
+%files
+%doc README.md
+%license LICENSE
+%license rust/LICENSE.dependencies
+%if 0%{?rhel}
+%license rust/cargo-vendor.txt
+%endif
+%{_bindir}/genprotimg
+%{_bindir}/pvattest
+%{_bindir}/pvextract-hdr
+%{_bindir}/pvimg
+%{_bindir}/pvsecret
+%{_bindir}/pvverify
+%{_mandir}/man1/genprotimg.1*
+%{_mandir}/man1/pvattest.1*
+%{_mandir}/man1/pvattest-check.1*
+%{_mandir}/man1/pvattest-create.1*
+%{_mandir}/man1/pvattest-perform.1*
+%{_mandir}/man1/pvattest-verify.1*
+%{_mandir}/man1/pvimg.1*
+%{_mandir}/man1/pvimg-create.1*
+%{_mandir}/man1/pvimg-info.1*
+%{_mandir}/man1/pvimg-test.1*
+%{_mandir}/man1/pvsecret-add.1*
+%{_mandir}/man1/pvsecret-create-association.1*
+%{_mandir}/man1/pvsecret-create-meta.1*
+%{_mandir}/man1/pvsecret-create-retrievable.1*
+%{_mandir}/man1/pvsecret-create-update-cck.1*
+%{_mandir}/man1/pvsecret-create.1*
+%{_mandir}/man1/pvsecret-list.1*
+%{_mandir}/man1/pvsecret-lock.1*
+%{_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}/_*
+
+#
+# enf of multi-arch section
+#
+%endif
+
+%ifarch s390x
+#
+# s390x specific sub-packages
+#
 #
 # ************************* s390-tools core package  *************************
 #
 %package core
 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
 
@@ -172,7 +356,7 @@ This package provides minimal set of tools needed to system to boot.
 
 %files core
 %doc README.md zdev/src/chzdev_usage.txt
-%doc LICENSE
+%license LICENSE
 %{_sbindir}/chreipl
 %{_sbindir}/chzdev
 %{_sbindir}/cio_ignore
@@ -180,17 +364,25 @@ This package provides minimal set of tools needed to system to boot.
 %{_sbindir}/dasdinfo
 %{_sbindir}/fdasd
 %{_sbindir}/lszdev
+%{_sbindir}/vmcp
 %{_sbindir}/zipl
+%{_sbindir}/zipl-editenv
 %dir /lib/s390-tools
 /lib/s390-tools/{zipl,chreipl}_helper.*
 /lib/s390-tools/cpictl
 /lib/s390-tools/stage3.bin
+/lib/s390-tools/zdev_id
+/lib/s390-tools/zdev-from-dasd_mod.dasd
 /lib/s390-tools/zdev-root-update
+/lib/s390-tools/zdev-to-dasd_mod.dasd
+/lib/s390-tools/zdev-to-rd.znet
 /lib/s390-tools/zipl.conf
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
+%config(noreplace) %{_sysconfdir}/ziplenv
 %{_unitdir}/cpi.service
 %config(noreplace) %{_sysconfdir}/sysconfig/cpi
 /usr/lib/dracut/modules.d/95zdev/
+/usr/lib/dracut/modules.d/95zdev-kdump/
 %{_mandir}/man5/zipl.conf.5*
 %{_mandir}/man8/chreipl.8*
 %{_mandir}/man8/chzdev.8*
@@ -199,7 +391,9 @@ This package provides minimal set of tools needed to system to boot.
 %{_mandir}/man8/dasdinfo.8*
 %{_mandir}/man8/fdasd.8*
 %{_mandir}/man8/lszdev.8*
+%{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/zipl.8*
+%{_mandir}/man8/zipl-editenv.8*
 
 # Additional Fedora/RHEL specific stuff
 %ghost %config(noreplace) %{_sysconfdir}/dasd.conf
@@ -217,9 +411,12 @@ 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
 %{_udevrulesdir}/90-cpi.rules
+%{_udevrulesdir}/80-hotplug-cpu.rules
 %{_sysconfdir}/kernel/install.d/20-grubby.install
 %{_prefix}/lib/kernel/install.d/10-zfcpdump.install
 %{_prefix}/lib/kernel/install.d/20-zipl-kernel.install
@@ -232,14 +429,18 @@ This package provides minimal set of tools needed to system to boot.
 #
 
 %package base
-License:        MIT
+License:        MIT AND LGPL-2.1-or-later AND %{extra_licenses_from_rust_deps}
 Summary:        S390 base tools
-Requires:       gawk sed coreutils
-Requires:       sg3_utils
+Provides:       s390-tools-base = %{epoch}:%{version}-%{release}
+Requires:       coreutils
 Requires:       ethtool
-Requires:       tar
 Requires:       file
+Requires:       gawk
+Requires:       sed
+Requires:       sg3_utils
+Requires:       tar
 Requires:       s390utils-core = %{epoch}:%{version}-%{release}
+Requires:       s390utils-se-data = %{epoch}:%{version}-%{release}
 %{?systemd_requires}
 BuildRequires:  perl-generators
 BuildRequires:  ncurses-devel
@@ -247,8 +448,8 @@ BuildRequires:  glibc-static
 BuildRequires:  cryptsetup-devel >= 2.0.3
 BuildRequires:  json-c-devel
 BuildRequires:  rpm-devel
-BuildRequires:  glib2-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  libnl3-devel
 
 
 %description base
@@ -313,11 +514,6 @@ s390 base tools. This collection provides the following utilities:
    * tunedasd:
      Adjust tunable parameters on DASD devices.
 
-   * vmconvert:
-     Convert system dumps created by the z/VM VMDUMP command into dumps with
-     LKCD format. These LKCD dumps can then be analyzed with the dump analysis
-     tool lcrash.
-
    * vmcp:
      Allows Linux users to send commands to the z/VM control program (CP).
      The normal usage is to invoke vmcp with the command you want to
@@ -331,9 +527,6 @@ s390 base tools. This collection provides the following utilities:
      feature. Those traces are filtered with the zfcpdbf script, i.e. merge
      several traces, make it more readable etc.
 
-   * scsi_logging_level:
-     Create, get or set the logging level for the SCSI logging facility.
-
    * zconf:
      Set of scripts to configure and list status information of Linux for
      zSeries IO devices.
@@ -385,10 +578,6 @@ For more information refer to the following publications:
    * "Device Drivers, Features, and Commands" chapter "Useful Linux commands"
    * "Using the dump tools"
 
-%pre base
-# check for zkeyadm group and create it
-getent group zkeyadm > /dev/null || groupadd -r zkeyadm
-
 %post base
 %systemd_post dumpconf.service
 
@@ -400,9 +589,14 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 
 %files base
 %doc README.md zdev/src/lszdev_usage.txt
+%license rust/LICENSE.dependencies
+%if 0%{?rhel}
+%license rust/cargo-vendor.txt
+%endif
 %{_sbindir}/chccwdev
 %{_sbindir}/chchp
 %{_sbindir}/chcpumf
+%{_sbindir}/chpstat
 %{_sbindir}/chshut
 %{_sbindir}/chzcrypt
 %{_sbindir}/dasdstat
@@ -417,8 +611,9 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/lscss
 %{_sbindir}/lsdasd
 %{_sbindir}/lshwc
-%{_sbindir}/lsqeth
 %{_sbindir}/lsluns
+%{_sbindir}/lsqeth
+%{_sbindir}/lspai
 %{_sbindir}/lsreipl
 %{_sbindir}/lsscm
 %{_sbindir}/lsshut
@@ -426,16 +621,17 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/lstape
 %{_sbindir}/lszcrypt
 %{_sbindir}/lszfcp
+%{_sbindir}/opticsmon
+%{_sbindir}/pai
 %{_sbindir}/qetharp
 %{_sbindir}/qethconf
 %{_sbindir}/qethqoat
-%{_sbindir}/scsi_logging_level
+%{_sbindir}/sclpdbf
 %{_sbindir}/start_hsnc.sh
 %{_sbindir}/tape390_crypt
 %{_sbindir}/tape390_display
 %{_sbindir}/ttyrun
 %{_sbindir}/tunedasd
-%{_sbindir}/vmcp
 %{_sbindir}/vmur
 %{_sbindir}/xcec-bridge
 %{_sbindir}/zcryptctl
@@ -443,17 +639,36 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_sbindir}/zfcpdbf
 %{_sbindir}/zgetdump
 %{_sbindir}/zipl-switch-to-blscfg
+%{_sbindir}/zmemtopo
 %{_sbindir}/znetconf
 %{_sbindir}/zpcictl
+%{_bindir}/cpacfinfo
 %{_bindir}/dump2tar
 %{_bindir}/genprotimg
 %{_bindir}/mk-s390image
-%{_bindir}/vmconvert
+%{_bindir}/pvapconfig
+%{_bindir}/pvimg
+%{_bindir}/pvinfo
+%{_bindir}/pvattest
+%{_bindir}/pvextract-hdr
+%{_bindir}/pvsecret
+%{_bindir}/pvverify
 %{_bindir}/zkey
 %{_bindir}/zkey-cryptsetup
+%{_bindir}/zpwr
 %{_unitdir}/dumpconf.service
+%{_unitdir}/opticsmon.service
 %ghost %config(noreplace) %{_sysconfdir}/zipl.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
+%{_sysconfdir}/mdevctl.d/*
+%{_sysusersdir}/s390utils-base.conf
+/usr/lib/dracut/modules.d/99ngdump/
+/usr/lib/dracut/dracut.conf.d/99-pkey.conf
+# own the mdevctl dirs until new release is available
+%dir /usr/lib/mdevctl
+%dir /usr/lib/mdevctl/scripts.d
+%dir /usr/lib/mdevctl/scripts.d/callouts
+/usr/lib/mdevctl/scripts.d/callouts/ap-check
 /lib/s390-tools/dumpconf
 /lib/s390-tools/lsznet.raw
 %dir /lib/s390-tools/zfcpdump
@@ -464,35 +679,59 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %dir %{_libdir}/zkey
 %{_libdir}/zkey/zkey-ekmfweb.so
 %{_libdir}/zkey/zkey-kmip.so
-%{_mandir}/man1/dbginfo.sh.1*
+%{_mandir}/man1/cpacfinfo.1*
 %{_mandir}/man1/dump2tar.1*
-%{_mandir}/man1/lscpumf.1*
-%{_mandir}/man1/lshwc.1*
-%{_mandir}/man1/vmconvert.1*
-%{_mandir}/man1/zfcpdbf.1*
-%{_mandir}/man1/zipl-switch-to-blscfg.1*
+%{_mandir}/man1/genprotimg.1*
+%{_mandir}/man1/mk-s390image.1*
+%{_mandir}/man1/pvapconfig.1*
+%{_mandir}/man1/pvattest.1*
+%{_mandir}/man1/pvattest-check.1*
+%{_mandir}/man1/pvattest-create.1*
+%{_mandir}/man1/pvattest-perform.1*
+%{_mandir}/man1/pvattest-verify.1*
+%{_mandir}/man1/pvimg.1*
+%{_mandir}/man1/pvimg-create.1*
+%{_mandir}/man1/pvimg-info.1*
+%{_mandir}/man1/pvimg-test.1*
+%{_mandir}/man1/pvsecret-add.1*
+%{_mandir}/man1/pvsecret-create-association.1*
+%{_mandir}/man1/pvsecret-create-meta.1*
+%{_mandir}/man1/pvsecret-create-retrievable.1*
+%{_mandir}/man1/pvsecret-create-update-cck.1*
+%{_mandir}/man1/pvsecret-create.1*
+%{_mandir}/man1/pvsecret-list.1*
+%{_mandir}/man1/pvsecret-lock.1*
+%{_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*
 %{_mandir}/man1/zkey-kmip.1*
+%{_mandir}/man1/zpwr.1*
 %{_mandir}/man4/prandom.4*
 %{_mandir}/man5/hsavmcore.conf.5*
 %{_mandir}/man8/chccwdev.8*
 %{_mandir}/man8/chchp.8*
 %{_mandir}/man8/chcpumf.8*
+%{_mandir}/man8/chpstat.8*
 %{_mandir}/man8/chshut.8*
 %{_mandir}/man8/chzcrypt.8*
 %{_mandir}/man8/dasdstat.8*
 %{_mandir}/man8/dasdview.8*
+%{_mandir}/man8/dbginfo.sh.8*
 %{_mandir}/man8/dumpconf.8*
-%{_mandir}/man8/genprotimg.8.*
 %{_mandir}/man8/hsavmcore.8*
 %{_mandir}/man8/hsci.8*
 %{_mandir}/man8/hyptop.8*
 %{_mandir}/man8/lschp.8*
+%{_mandir}/man8/lscpumf.8*
 %{_mandir}/man8/lscss.8*
 %{_mandir}/man8/lsdasd.8*
+%{_mandir}/man8/lshwc.8*
 %{_mandir}/man8/lsluns.8*
+%{_mandir}/man8/lspai.8*
 %{_mandir}/man8/lsqeth.8*
 %{_mandir}/man8/lsreipl.8*
 %{_mandir}/man8/lsscm.8*
@@ -501,6 +740,8 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/lstape.8*
 %{_mandir}/man8/lszcrypt.8*
 %{_mandir}/man8/lszfcp.8*
+%{_mandir}/man8/opticsmon.8*
+%{_mandir}/man8/pai.8*
 %{_mandir}/man8/qetharp.8*
 %{_mandir}/man8/qethconf.8*
 %{_mandir}/man8/qethqoat.8*
@@ -508,16 +749,19 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 %{_mandir}/man8/tape390_display.8*
 %{_mandir}/man8/ttyrun.8*
 %{_mandir}/man8/tunedasd.8*
-%{_mandir}/man8/vmcp.8*
 %{_mandir}/man8/vmur.8*
 %{_mandir}/man8/zcryptctl.8*
 %{_mandir}/man8/zcryptstats.8*
+%{_mandir}/man8/zfcpdbf.8*
 %{_mandir}/man8/zgetdump.8*
+%{_mandir}/man8/zipl-switch-to-blscfg.8*
+%{_mandir}/man8/zmemtopo.8*
 %{_mandir}/man8/znetconf.8*
 %{_mandir}/man8/zpcictl.8*
 %dir %{_datadir}/s390-tools
-%{_datadir}/s390-tools/genprotimg/
 %{_datadir}/s390-tools/netboot/
+%{bash_completions_dir}/*.bash
+%{zsh_completions_dir}/_*
 %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
 %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
 %dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip/profiles
@@ -528,11 +772,25 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
 # Additional Fedora/RHEL specific stuff
 /boot/tape0
 
+%package se-data
+License:        MIT
+Summary:        Data for Secure Execution
+Provides:       s390-tools-se-data = %{epoch}:%{version}-%{release}
+BuildArch:      noarch
+
+%description se-data
+%{summary}.
+
+%files se-data
+%dir %{_datadir}/s390-tools
+%{_datadir}/s390-tools/pvimg/
+
 #
 # *********************** s390-tools osasnmpd package  ***********************
 #
 %package osasnmpd
 Summary:        SNMP sub-agent for OSA-Express cards
+Provides:       s390-tools-osasnmpd = %{epoch}:%{version}-%{release}
 Requires:       net-snmp
 Requires:       psmisc
 BuildRequires:  net-snmp-devel
@@ -552,6 +810,7 @@ ATM Ethernet LAN Emulation in QDIO mode.
 #
 %package mon_statd
 Summary:         Monitoring daemons for Linux in z/VM
+Provides:        s390-tools-mon_statd = %{epoch}:%{version}-%{release}
 Requires:        coreutils
 %{?systemd_requires}
 
@@ -591,6 +850,7 @@ Monitoring daemons for Linux in z/VM:
 #
 %package cpuplugd
 Summary:         Daemon that manages CPU and memory resources
+Provides:        s390-tools-cpuplugd = %{epoch}:%{version}-%{release}
 %{?systemd_requires}
 BuildRequires: systemd
 
@@ -620,6 +880,7 @@ memory can be increased or decreased exploiting the CMM1 feature.
 #
 %package ziomon
 Summary:        S390 ziomon tools
+Provides:       s390-tools-ziomon = %{epoch}:%{version}-%{release}
 Requires:       blktrace
 Requires:       coreutils
 Requires:       device-mapper-multipath
@@ -658,6 +919,7 @@ Tool set to collect data for zfcp performance analysis and report.
 #
 %package iucvterm
 Summary:        z/VM IUCV terminal applications
+Provides:       s390-tools-iucvterm = %{epoch}:%{version}-%{release}
 Requires(pre):  shadow-utils
 Requires(post): grep
 Requires(postun): grep
@@ -674,10 +936,6 @@ active TCP/IP connection between two Linux guest operating systems.
 - ts-shell:  Terminal server shell to authorize and control IUCV terminal
              connections for individual Linux users.
 
-%pre iucvterm
-# check for ts-shell group and create it
-getent group ts-shell > /dev/null || groupadd -r ts-shell
-
 %post iucvterm
 # /etc/shells is provided by "setup"
 grep -q '^/usr/bin/ts-shell$' /etc/shells \
@@ -703,13 +961,16 @@ fi
 %{_bindir}/ts-shell
 %{_sbindir}/chiucvallow
 %{_sbindir}/lsiucvallow
-%dir %attr(2770,root,ts-shell) /var/log/ts-shell
+%{_sysusersdir}/s390utils-iucvterm.conf
+%{_tmpfilesdir}/s390utils-iucvterm.conf
+%ghost %dir %attr(2770,root,ts-shell) /var/log/ts-shell
 %doc iucvterm/doc/ts-shell
 %{_mandir}/man1/iucvconn.1*
 %{_mandir}/man1/iucvtty.1*
 %{_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
@@ -720,8 +981,10 @@ fi
 #
 %package cmsfs-fuse
 Summary:        CMS file system based on FUSE
-BuildRequires:  fuse-devel
-Requires:       fuse
+BuildRequires:  fuse3-devel
+Requires:       fuse3
+Provides:       s390-tools-cmsfs-fuse = %{epoch}:%{version}-%{release}
+Requires:       glibc-gconv-extra
 Obsoletes:      %{name}-cmsfs < 2:2.7.0-3
 
 %description cmsfs-fuse
@@ -738,9 +1001,10 @@ This package contains the CMS file system based on FUSE.
 #
 %package zdsfs
 Summary:        z/OS data set access based on FUSE
-BuildRequires:  fuse-devel
+BuildRequires:  fuse3-devel
 BuildRequires:  libcurl-devel
-Requires:       fuse
+Requires:       fuse3
+Provides:       s390-tools-zdsfs = %{epoch}:%{version}-%{release}
 
 %description zdsfs
 This package contains the z/OS data set access based on FUSE.
@@ -754,8 +1018,9 @@ This package contains the z/OS data set access based on FUSE.
 #
 %package hmcdrvfs
 Summary:       HMC drive file system based on FUSE
-BuildRequires: fuse-devel
-Requires:      fuse
+BuildRequires: fuse3-devel
+Requires:      fuse3
+Provides:      s390-tools-hmcdrvfs = %{epoch}:%{version}-%{release}
 
 %description hmcdrvfs
 This package contains a HMC drive file system based on FUSE and a tool
@@ -772,11 +1037,13 @@ to list files and directories.
 #
 %package cpacfstatsd
 Summary:       Monitor and maintain CPACF activity counters
+Provides:      s390-tools-cpacfstatsd = %{epoch}:%{version}-%{release}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 Requires(pre): shadow-utils
 BuildRequires: systemd
+BuildRequires: systemd-devel
 
 %description cpacfstatsd
 The cpacfstats tools provide a client/server application set to monitor
@@ -791,22 +1058,64 @@ and maintain CPACF activity counters.
 %postun cpacfstatsd
 %systemd_postun_with_restart cpacfstatsd.service
 
-%pre cpacfstatsd
-getent group cpacfstats >/dev/null || groupadd -r cpacfstats
-
 %files cpacfstatsd
 %{_bindir}/cpacfstats
 %{_sbindir}/cpacfstatsd
 %{_mandir}/man1/cpacfstats.1*
 %{_mandir}/man8/cpacfstatsd.8*
 %{_unitdir}/cpacfstatsd.service
+%{_sysusersdir}/s390utils-cpacfstatsd.conf
+
+#
+# *********************** chreipl-fcp-mpath package  ***********************
+#
+%package chreipl-fcp-mpath
+Summary:          Use multipath information for re-IPL path failover
+BuildRequires:    make
+BuildRequires:    bash
+BuildRequires:    coreutils
+%if %{with pandoc}
+BuildRequires:    pandoc
+%endif
+BuildRequires:    gawk
+BuildRequires:    gzip
+BuildRequires:    sed
+Provides:         s390-tools-chreipl-fcp-mpath = %{epoch}:%{version}-%{release}
+Requires:         bash
+Requires:         coreutils
+Requires:         util-linux
+Requires:         systemd-udev
+Requires:         device-mapper-multipath
+Requires:         dracut
+
+%description chreipl-fcp-mpath
+The chreipl-fcp-mpath toolset monitors udev events about paths to the re-IPL
+volume. If the currently configured FCP re-IPL path becomes unavailable, the
+toolset checks for operational paths to the same volume. If available, it
+reconfigures the FCP re-IPL settings to use an operational path.
+
+%files chreipl-fcp-mpath
+%doc chreipl-fcp-mpath/README.md
+%if %{with pandoc}
+%doc chreipl-fcp-mpath/README.html
+%endif
+%dir %{_prefix}/lib/chreipl-fcp-mpath/
+%{_prefix}/lib/chreipl-fcp-mpath/*
+%{_prefix}/lib/dracut/dracut.conf.d/70-chreipl-fcp-mpath.conf
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-tgt
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-vol
+%{_prefix}/lib/udev/chreipl-fcp-mpath-is-reipl-zfcp
+%{_prefix}/lib/udev/chreipl-fcp-mpath-record-volume-identifier
+%{_prefix}/lib/udev/chreipl-fcp-mpath-try-change-ipl-path
+%{_udevrulesdir}/70-chreipl-fcp-mpath.rules
+%{_mandir}/man7/chreipl-fcp-mpath.7*
 
 #
 # *********************** devel package  ***********************
 #
 %package devel
 Summary:        Development files
-
+Provides: s390-tools-devel = %{epoch}:%{version}-%{release}
 Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -819,8 +1128,171 @@ User-space development files for the s390/s390x architecture.
 %{_libdir}/libekmfweb.so
 %{_libdir}/libkmipclient.so
 
+#
+# end of s390x specific sub-packages
+#
+%endif
+
 
 %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
+
+* Fri Jun 27 2025 Dan Horák <dan[at]danny.cz> - 2:2.38.0-1
+- rebased to 2.38.0 (rhbz#2374765)
+
+* Thu Mar 13 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 2:2.37.0-2
+- Properly generate Rust BuildRequires on Fedora
+- Update License (for s390utils/s390utils-base) to reflect Rust deps.
+
+* Thu Feb 27 2025 Jakub Čajka <jcajka@redhat.com> - 2:2.37.0-1
+- rebased to 2.37.0 (rhbz#2330787)
+
+* Mon Feb 24 2025 Dan Horák <dan[at]danny.cz> - 2:2.36.0-1
+- rebased to 2.36.0 (rhbz#2330787)
+
+* Thu Feb 06 2025 Fabio Valentini <decathorpe@gmail.com> - 2:2.35.0-5
+- Rebuild for openssl crate >= v0.10.70 (RUSTSEC-2025-0004)
+
+* Mon Jan 20 2025 Dan Horák <dan[at]danny.cz> - 2:2.35.0-4
+- fix build with gcc15
+- Resolves: rhbz#2338176
+
+* Wed Jan 15 2025 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 2:2.35.0-3
+- Add sysusers.d config
+
+* Tue Jan 14 2025 Dan Horák <dan[at]danny.cz> - 2:2.35.0-2
+- updated for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
+
+* Thu Oct 03 2024 Dan Horák <dan[at]danny.cz> - 2:2.35.0-1
+- rebased to 2.35.0 (rhbz#2316232)
+
+* Mon Aug 26 2024 Dan Horák <dan[at]danny.cz> - 2:2.34.0-2
+- don't make Rust warnings fatal
+
+* Mon Aug 12 2024 Dan Horák <dan[at]danny.cz> - 2:2.34.0-1
+- rebased to 2.34.0 (rhbz#2302462)
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.33.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Dan Horák <dan[at]danny.cz> - 2:2.33.1-3
+- "which" is not required any more
+- Revert "zipl/src: Fix problems when target parameters are specified by user"
+
+* Thu Jun 20 2024 Dan Horák <dan[at]danny.cz> - 2:2.33.1-2
+- add which as a dependency for base and ziomon subpackages (RHEL-38488)
+
+* Tue May 28 2024 Dan Horák <dan[at]danny.cz> - 2:2.33.1-1
+- rebased to 2.33.1 (rhbz#2283542)
+
+* Thu Apr 04 2024 Dan Horák <dan[at]danny.cz> - 2:2.32.0-1
+- rebased to 2.32.0 (rhbz#2273003)
+
+* Fri Mar 08 2024 Neal Gompa <ngompa@fedoraproject.org> - 2:2.31.0-2
+- Add 's390-tools' Provides to all packages
+
+* Mon Feb 05 2024 Dan Horák <dan[at]danny.cz> - 2:2.31.0-1
+- rebased to 2.31.0 (rhbz#2262499)
+
+* Thu Jan 25 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-2
+- add s390utils-se-data as a noarch subpackage with Secure Execution data files
+
+* Tue Jan 02 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-1
+- rebased to 2.30.0 (rhbz#2252519)
+
+* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2:2.29.0-6
+- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)
+
+* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-5
+- enable multi-arch build
+
+* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-4
+- fix upstream kernel installations
+
+* Mon Oct 23 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2:2.29.0-3
+- Use vendored dependencies in RHEL builds
+
+* Thu Aug 31 2023 Jakub Čajka <jcajka[at]redhat.com> - 2:2.29.0-2
+- enable rust based tools
+
+* Mon Aug 07 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-1
+- rebased to 2.29.0
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.28.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Dan Horák <dan[at]danny.cz> - 2:2.28.0-1
+- rebased to 2.28.0
+
+* Wed May 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.27.0-1
+- rebased to 2.27.0
+
+* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 2:2.26.0-2
+- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
+
+* Fri Mar 03 2023 Dan Horák <dan[at]danny.cz> - 2:2.26.0-1
+- rebased to 2.26.0
+
+* Tue Jan 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-4
+- add post GA fixes
+
+* Mon Jan 23 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-3
+- revert the kernel install script change
+
+* Thu Jan 19 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-2
+- update kernel install script to write /etc/kernel/cmdline
+
+* Fri Dec 09 2022 Dan Horák <dan[at]danny.cz> - 2:2.25.0-1
+- rebased to 2.25.0
+
+* Tue Nov 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-2
+- update for Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling
+
+* Thu Nov 10 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-1
+- rebased to 2.24.0
+
+* Fri Aug 19 2022 Dan Horák <dan[at]danny.cz> - 2:2.23.0-1
+- rebased to 2.23.0
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.22.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 20 2022 Dan Horák <dan[at]danny.cz> - 2:2.22.0-1
+- rebased to 2.22.0
+
+* Tue May 31 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-2
+- do not fail on emtpy /proc/cmdline when installing kernel (#1899759)
+
+* Fri Apr 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-1
+- rebased to 2.21.0
+
+* Mon Feb 07 2022 Dan Horák <dan[at]danny.cz> - 2:2.20.0-1
+- rebased to 2.20.0
+- switch to fuse3
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Nov 26 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-2
+- update ccw udev rules
+
+* Fri Nov 12 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1
+- rebased to 2.19.0
+- cmsfs-fuse Requires glibc-gconv-extra (#2022652)
+
+* Wed Oct 20 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-2
+- move vmcp to core (#1931287)
+
+* Tue Oct 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-1
+- rebased to 2.18.0
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.17.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index f999e3d..8572938 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (s390-tools-2.17.0.tar.gz) = 57d1c90e2a270c380fd7b4ac8efdd301299d9e8671a7ff10747557135b27a06e8124a49f50b8729b450550ced61599f392606bcbe5e499c5bd488b9e207945da
+SHA512 (s390-tools-2.40.0.tar.gz) = 1943429581b280bf9ea370da3700a234d509837cb45b2354cdf79b38db87d2183010d18d9132defd77b9d8e11b7e002c447ffd7c912e20a50da4cb6877758c0e
+SHA512 (s390-tools-2.40.0-rust-vendor.tar.xz) = fd1894c4e950a3c51054432731a3aeef4318e794aa4af2dc5fed31da16dce2020f014a64241e44766fb40b0fd6c1ac5943366e38dcfebf264875220ecf1285b5