diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 5c25b1b44..d07842c93 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -224,6 +224,8 @@ if grep -qw scst_sysfs scst/kernel/in-tree/Makefile.scst-${kver} \
    || [ "${generating_upstream_patch}" = "true" ];
 then
   specialize_patch_options="${specialize_patch_options} -v config_scst_proc_undefined=1"
+else
+  include_proc_impl="true"
 fi
 if [ "${debug_specialize}" = "true" ]; then
   specialize_patch_options="${specialize_patch_options} -v debug=1"
@@ -295,7 +297,7 @@ scst_13_vdisk="scst/src/dev_handlers/scst_vdisk.c"
 scst_14_tg="scst/src/scst_tg.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 scst_14_tg"
 
-if [ "${generating_upstream_patch}" = "false" ]; then
+if [ "$include_proc_impl" = "true" ]; then
   separate_patches+=" scst_proc"
 fi
 source_files_in_separate_patch=""
@@ -335,7 +337,7 @@ add_file "${tmp_Kconfig}" "drivers/scst/Kconfig"
 
 tmp_Makefile="${tmpdir}/Makefile.scst-${kver}"
 cat "scst/kernel/in-tree/Makefile.scst-${kver}" | \
-if [ "${generating_upstream_patch}" = "true" ]; then
+if [ "$include_proc_impl" != "true" ]; then
   grep -v 'scst_proc'
 else
   cat