diff --git a/0043-idmb_rec_write-check-for-tpgt-first.patch b/0143-idmb_rec_write-check-for-tpgt-first.patch
similarity index 100%
rename from 0043-idmb_rec_write-check-for-tpgt-first.patch
rename to 0143-idmb_rec_write-check-for-tpgt-first.patch
diff --git a/0044-iscsid-add-initrd-option-to-set-run-from-initrd-hint.patch b/0144-iscsid-add-initrd-option-to-set-run-from-initrd-hint.patch
similarity index 100%
rename from 0044-iscsid-add-initrd-option-to-set-run-from-initrd-hint.patch
rename to 0144-iscsid-add-initrd-option-to-set-run-from-initrd-hint.patch
diff --git a/0045-idbm_rec_write-seperate-old-and-new-style-writes.patch b/0145-idbm_rec_write-seperate-old-and-new-style-writes.patch
similarity index 100%
rename from 0045-idbm_rec_write-seperate-old-and-new-style-writes.patch
rename to 0145-idbm_rec_write-seperate-old-and-new-style-writes.patch
diff --git a/0046-idbw_rec_write-pick-tpgt-from-existing-record.patch b/0146-idbw_rec_write-pick-tpgt-from-existing-record.patch
similarity index 100%
rename from 0046-idbw_rec_write-pick-tpgt-from-existing-record.patch
rename to 0146-idbw_rec_write-pick-tpgt-from-existing-record.patch
diff --git a/0047-iscsiadm-iscsid-newroot-command-to-survive-switch_ro.patch b/0147-iscsiadm-iscsid-newroot-command-to-survive-switch_ro.patch
similarity index 100%
rename from 0047-iscsiadm-iscsid-newroot-command-to-survive-switch_ro.patch
rename to 0147-iscsiadm-iscsid-newroot-command-to-survive-switch_ro.patch
diff --git a/0047-iscsiuio-systemd-socket-activation-support.patch b/0147-iscsiuio-systemd-socket-activation-support.patch
similarity index 100%
rename from 0047-iscsiuio-systemd-socket-activation-support.patch
rename to 0147-iscsiuio-systemd-socket-activation-support.patch
diff --git a/0048-iscsiadm-param-parsing-for-advanced-node-creation.patch b/0148-iscsiadm-param-parsing-for-advanced-node-creation.patch
similarity index 100%
rename from 0048-iscsiadm-param-parsing-for-advanced-node-creation.patch
rename to 0148-iscsiadm-param-parsing-for-advanced-node-creation.patch
diff --git a/0049-update-systemd-service-files-add-iscsi.service-for-s.patch b/0149-update-systemd-service-files-add-iscsi.service-for-s.patch
similarity index 100%
rename from 0049-update-systemd-service-files-add-iscsi.service-for-s.patch
rename to 0149-update-systemd-service-files-add-iscsi.service-for-s.patch
diff --git a/0050-iscsi-boot-related-service-file-updates.patch b/0150-iscsi-boot-related-service-file-updates.patch
similarity index 100%
rename from 0050-iscsi-boot-related-service-file-updates.patch
rename to 0150-iscsi-boot-related-service-file-updates.patch
diff --git a/0051-update-initscripts-and-docs.patch b/0151-update-initscripts-and-docs.patch
similarity index 100%
rename from 0051-update-initscripts-and-docs.patch
rename to 0151-update-initscripts-and-docs.patch
diff --git a/0052-use-var-for-config.patch b/0152-use-var-for-config.patch
similarity index 100%
rename from 0052-use-var-for-config.patch
rename to 0152-use-var-for-config.patch
diff --git a/0053-use-red-hat-for-name.patch b/0153-use-red-hat-for-name.patch
similarity index 100%
rename from 0053-use-red-hat-for-name.patch
rename to 0153-use-red-hat-for-name.patch
diff --git a/0054-add-libiscsi.patch b/0154-add-libiscsi.patch
similarity index 100%
rename from 0054-add-libiscsi.patch
rename to 0154-add-libiscsi.patch
diff --git a/0055-dont-use-static.patch b/0155-dont-use-static.patch
similarity index 100%
rename from 0055-dont-use-static.patch
rename to 0155-dont-use-static.patch
diff --git a/0056-remove-the-offload-boot-supported-ifdef.patch b/0156-remove-the-offload-boot-supported-ifdef.patch
similarity index 100%
rename from 0056-remove-the-offload-boot-supported-ifdef.patch
rename to 0156-remove-the-offload-boot-supported-ifdef.patch
diff --git a/0058-iscsiuio-IPC-newroot-command.patch b/0158-iscsiuio-IPC-newroot-command.patch
similarity index 100%
rename from 0058-iscsiuio-IPC-newroot-command.patch
rename to 0158-iscsiuio-IPC-newroot-command.patch
diff --git a/0059-iscsiuio-systemd-unit-files.patch b/0159-iscsiuio-systemd-unit-files.patch
similarity index 100%
rename from 0059-iscsiuio-systemd-unit-files.patch
rename to 0159-iscsiuio-systemd-unit-files.patch
diff --git a/0060-use-systemctl-to-start-iscsid.patch b/0160-use-systemctl-to-start-iscsid.patch
similarity index 100%
rename from 0060-use-systemctl-to-start-iscsid.patch
rename to 0160-use-systemctl-to-start-iscsid.patch
diff --git a/0061-resolve-565245-multilib-issues-caused-by-doxygen.patch b/0161-resolve-565245-multilib-issues-caused-by-doxygen.patch
similarity index 100%
rename from 0061-resolve-565245-multilib-issues-caused-by-doxygen.patch
rename to 0161-resolve-565245-multilib-issues-caused-by-doxygen.patch
diff --git a/0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch b/0162-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
similarity index 100%
rename from 0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
rename to 0162-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
diff --git a/0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch b/0163-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
similarity index 100%
rename from 0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
rename to 0163-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
diff --git a/0064-libiscsi-fix-incorrect-strncpy-use.patch b/0164-libiscsi-fix-incorrect-strncpy-use.patch
similarity index 100%
rename from 0064-libiscsi-fix-incorrect-strncpy-use.patch
rename to 0164-libiscsi-fix-incorrect-strncpy-use.patch
diff --git a/0065-fix-hardened-build-of-iscsiuio.patch b/0165-fix-hardened-build-of-iscsiuio.patch
similarity index 100%
rename from 0065-fix-hardened-build-of-iscsiuio.patch
rename to 0165-fix-hardened-build-of-iscsiuio.patch
diff --git a/0066-start-socket-listeners-on-iscsiadm-command.patch b/0166-start-socket-listeners-on-iscsiadm-command.patch
similarity index 100%
rename from 0066-start-socket-listeners-on-iscsiadm-command.patch
rename to 0166-start-socket-listeners-on-iscsiadm-command.patch
diff --git a/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
similarity index 100%
rename from 0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
rename to 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index e3b2fe5..4fa2d59 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -57,29 +57,29 @@ Patch40: 0040-iscsi-tools-Correctly-get-username_in-and-password_i.patch
 Patch41: 0041-README-changes-for-adding-support-to-set-CHAP-entry.patch
 
 # not (yet) upstream merged
-Patch43: 0043-idmb_rec_write-check-for-tpgt-first.patch
-Patch45: 0045-idbm_rec_write-seperate-old-and-new-style-writes.patch
-Patch46: 0046-idbw_rec_write-pick-tpgt-from-existing-record.patch
-Patch47: 0047-iscsiuio-systemd-socket-activation-support.patch
-Patch49: 0049-update-systemd-service-files-add-iscsi.service-for-s.patch
-Patch50: 0050-iscsi-boot-related-service-file-updates.patch
+Patch143: 0143-idmb_rec_write-check-for-tpgt-first.patch
+Patch145: 0145-idbm_rec_write-seperate-old-and-new-style-writes.patch
+Patch146: 0146-idbw_rec_write-pick-tpgt-from-existing-record.patch
+Patch147: 0147-iscsiuio-systemd-socket-activation-support.patch
+Patch149: 0149-update-systemd-service-files-add-iscsi.service-for-s.patch
+Patch150: 0150-iscsi-boot-related-service-file-updates.patch
 # distro specific modifications
-Patch51: 0051-update-initscripts-and-docs.patch
-Patch52: 0052-use-var-for-config.patch
-Patch53: 0053-use-red-hat-for-name.patch
-Patch54: 0054-add-libiscsi.patch
-Patch55: 0055-dont-use-static.patch
-Patch56: 0056-remove-the-offload-boot-supported-ifdef.patch
-Patch59: 0059-iscsiuio-systemd-unit-files.patch
-Patch60: 0060-use-systemctl-to-start-iscsid.patch
-Patch61: 0061-resolve-565245-multilib-issues-caused-by-doxygen.patch
-Patch62: 0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
-Patch63: 0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
-Patch64: 0064-libiscsi-fix-incorrect-strncpy-use.patch
-Patch65: 0065-fix-hardened-build-of-iscsiuio.patch
-Patch66: 0066-start-socket-listeners-on-iscsiadm-command.patch
+Patch151: 0151-update-initscripts-and-docs.patch
+Patch152: 0152-use-var-for-config.patch
+Patch153: 0153-use-red-hat-for-name.patch
+Patch154: 0154-add-libiscsi.patch
+Patch155: 0155-dont-use-static.patch
+Patch156: 0156-remove-the-offload-boot-supported-ifdef.patch
+Patch159: 0159-iscsiuio-systemd-unit-files.patch
+Patch160: 0160-use-systemctl-to-start-iscsid.patch
+Patch161: 0161-resolve-565245-multilib-issues-caused-by-doxygen.patch
+Patch162: 0162-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
+Patch163: 0163-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
+Patch164: 0164-libiscsi-fix-incorrect-strncpy-use.patch
+Patch165: 0165-fix-hardened-build-of-iscsiuio.patch
+Patch166: 0166-start-socket-listeners-on-iscsiadm-command.patch
 # version string, needs to be updated with each build
-Patch99: 0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
 
 BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel
 # For dir ownership
@@ -150,29 +150,29 @@ developing applications that use %{name}.
 %patch40 -p1
 %patch41 -p1
 # pending upstream merge
-%patch43 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch49 -p1
-%patch50 -p1
+%patch143 -p1
+%patch145 -p1
+%patch146 -p1
+%patch147 -p1
+%patch149 -p1
+%patch150 -p1
 # distro specific modifications
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
+%patch151 -p1
+%patch152 -p1
+%patch153 -p1
+%patch154 -p1
+%patch155 -p1
+%patch156 -p1
+%patch159 -p1
+%patch160 -p1
+%patch161 -p1
+%patch162 -p1
+%patch163 -p1
+%patch164 -p1
+%patch165 -p1
+%patch166 -p1
 # version string
-%patch99 -p1
+%patch199 -p1
 
 # change exec_prefix, there's no easy way to override
 %{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile