diff --git a/bind.spec b/bind.spec
index 5f26e8f..abf2b1a 100644
--- a/bind.spec
+++ b/bind.spec
@@ -100,7 +100,8 @@ Patch135:bind-9.14-config-pkcs11.patch
 # Fedora specific patch to distribute native-pkcs#11 functionality
 Patch136:bind-9.10-dist-native-pkcs11.patch
 # Do not use isc-pkcs11.
-Patch149:bind-9.11-kyua-pkcs11.patch
+Patch137:bind-9.11-kyua-pkcs11.patch
+# Patch 138-139 reserved for pkcs11
 
 Patch157:bind-9.11-fips-tests.patch
 Patch164:bind-9.11-rh1666814.patch
@@ -460,18 +461,16 @@ in HTML and PDF format.
 %autosetup -N
 
 # Common patches
-%autopatch -p1 -m 1 -M 134
-# PKCS11 patches 135 136 and 149 are applied later.
-%autopatch -p1 -m 150
+%autopatch -p1 -m 0 -M 134
+%autopatch -p1 -m 140
 
 %if %{with PKCS11}
-%autopatch -p1 135
+%autopatch -p1 -m 135 -M 135
 cp -r bin/named{,-pkcs11}
 cp -r bin/dnssec{,-pkcs11}
 cp -r lib/dns{,-pkcs11}
 cp -r lib/ns{,-pkcs11}
-%autopatch -p1 136
-%autopatch -p1 149
+%autopatch -p1 -m 136 -M 139
 %endif
 
 # Sparc and s390 arches need to use -fPIE