diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index b667a858f..8a07ca056 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -284,7 +284,7 @@ scst_proc="scst/src/scst_proc.c"
 scst_10_sgv="scst/include/scst_sgv.h scst/src/scst_mem.h scst/src/scst_mem.c doc/sgv_cache.txt"
 scst_user="scst/include/scst_user.h scst/src/dev_handlers/scst_user.c"
 scst_13_vdisk="scst/src/dev_handlers/scst_vdisk.c"
-separate_patches="scst_03_public_headers scst_04_main scst_05_targ scst_06_lib scst_07_pres scst_08_sysfs scst_09_debug scst_10_sgv scst_user scst_13_vdisk"
+separate_patches="scst_02_public_headers scst_03_main scst_04_targ scst_05_lib scst_06_pres scst_07_sysfs scst_08_debug scst_09_sgv scst_user scst_12_vdisk"
 
 if [ "${generating_upstream_patch}" = "false" ]; then
   separate_patches+=" scst_proc"
@@ -306,7 +306,7 @@ add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kernel_version}.patch" \
 add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kernel_version}.patch"\
           "drivers/Makefile"
 ) \
-| process_patch "scst_01_drivers_kbuild.diff"
+| process_patch "scst_18_drivers_kbuild.diff"
 
 
 # Directory drivers/scst/
@@ -340,7 +340,7 @@ add_file "$tmp_Makefile" "drivers/scst/Makefile"
 
 rm -rf "${tmpdir}"
 ) \
-| process_patch "scst_02_scst_kbuild.diff"
+| process_patch "scst_01_scst_kbuild.diff"
 
 for s in ${separate_patches}
 do
@@ -361,14 +361,14 @@ done
 {
   add_file "scst/README_in-tree" "Documentation/scst/README.scst"
   add_file "scst/SysfsRules" "Documentation/scst/SysfsRules"
-} | process_patch "scst_11_core_doc.diff"
+} | process_patch "scst_10_core_doc.diff"
 
 
 # Directory drivers/scst/dev_handlers/
 
 add_file "scst/kernel/in-tree/Makefile.dev_handlers-${kernel_version}" \
          "drivers/scst/dev_handlers/Makefile" \
-| process_patch "scst_12_dev_handlers_makefile.diff"
+| process_patch "scst_11_dev_handlers_makefile.diff"
 
 for f in $(ls scst/src/dev_handlers/*.[ch] 2>/dev/null)
 do
@@ -376,7 +376,7 @@ do
     add_file "${f}" "drivers/scst/dev_handlers/${f#scst/src/dev_handlers/}"
   fi
 done \
-| process_patch "scst_14_passthrough.diff"
+| process_patch "scst_13_passthrough.diff"
 
 
 # Directory drivers/scst/fcst/
@@ -502,7 +502,7 @@ else
   add_empty_file "drivers/scst/srpt/Makefile"
 
 fi \
-| process_patch "scst_17_srpt.diff"
+| process_patch "scst_16_srpt.diff"
 
 
 # Directory drivers/message/fusion/mpt_scst
@@ -539,7 +539,7 @@ fi
 
   add_file "scst_local/scst_local.c" "drivers/scst/scst_local/scst_local.c"
 ) \
-| process_patch "scst_16_local.diff"
+| process_patch "scst_15_local.diff"
 
 
 
@@ -585,7 +585,7 @@ EOF
     add_file "ibmvstgt/README" "Documentation/powerpc/ibmvstgt.txt"
   fi
 } \
-| process_patch "scst_18_ibmvstgt.diff"
+| process_patch "scst_17_ibmvstgt.diff"
 
 {
   ( cd ibmvstgt && ./generate-in-tree-patches "${kernel_version}" )