diff --git a/s390utils.spec b/s390utils.spec
index 3efc9dc..e9ffe0b 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -105,15 +105,8 @@ 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
-%patch 0 -p1 -b .zipl-invert-script-options
-%patch 1 -p1 -b .blscfg-rpm-nvr-sort
-%patch 2 -p1 -b .snmp
-
-# upstream fixes/updates
-#%%patch 100 -p1
 %if %{with rust}
 %if 0%{?rhel}
 pushd rust