diff --git a/bind.spec b/bind.spec
index 2aa155c..f2d4650 100644
--- a/bind.spec
+++ b/bind.spec
@@ -85,21 +85,22 @@ Source47: named-pkcs11.service
 Source48: setup-named-softhsm.sh
 Source49: named-chroot.files
 
+# Make PKCS11 used only for pkcs11 parts
+Patch1:  bind-9.14-config-pkcs11.patch
+# Fedora specific patch to distribute native-pkcs#11 functionality
+Patch2:  bind-9.10-dist-native-pkcs11.patch
+# Do not use isc-pkcs11.
+Patch3:  bind-9.11-kyua-pkcs11.patch
+
 # Common patches
-Patch10: bind-9.5-PIE.patch
-Patch16: bind-9.16-redhat_doc.patch
+Patch18: bind-9.5-PIE.patch
+Patch19: bind-9.16-redhat_doc.patch
 Patch20: bind-9.5-dlz-64bit.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/5601
 Patch21: bind93-rh490837.patch
 Patch22: bind-9.11-fips-tests.patch
 Patch23: bind97-rh645544.patch
 Patch24: bind-9.9.1-P2-dlz-libdb.patch
-# Make PKCS11 used only for pkcs11 parts
-Patch70: bind-9.14-config-pkcs11.patch
-# Fedora specific patch to distribute native-pkcs#11 functionality
-Patch71: bind-9.10-dist-native-pkcs11.patch
-# Do not use isc-pkcs11.
-Patch72: bind-9.11-kyua-pkcs11.patch
 
 # https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/2689
 Patch25:bind-9.11-rh1666814.patch
@@ -393,15 +394,15 @@ in HTML and PDF format.
 # RHEL does not yet support this verification
 %{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
 %endif
-%autosetup -n %{name}-%{version} -p1 -N
-%autopatch -p1 -M 69
+%autosetup -n %{name}-%{version} -N
+%autopatch -p1 -m 18
 %if %{with PKCS11}
-%autopatch -m 70 -M 70
+%autopatch -p1 -m 1 -M 1
 cp -r bin/named{,-pkcs11}
 cp -r bin/dnssec{,-pkcs11}
 cp -r lib/dns{,-pkcs11}
 cp -r lib/ns{,-pkcs11}
-%autopatch -m 71
+%autopatch -p1 -m 2 -M 17
 %endif
 
 # Sparc and s390 arches need to use -fPIE