diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 29847936f..6af9fd0de 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -643,7 +643,11 @@ fi
 
   add_file "scst_local/in-tree/Kconfig" "drivers/scst/scst_local/Kconfig"
 
-  add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile"
+  if [ -e "scst_local/in-tree/Makefile-${kver}" ]; then
+    add_file "scst_local/in-tree/Makefile-${kver}" "drivers/scst/scst_local/Makefile"
+  else
+    add_file "scst_local/in-tree/Makefile" "drivers/scst/scst_local/Makefile"
+  fi
 
   add_file "scst_local/scst_local.c" "drivers/scst/scst_local/scst_local.c"
 ) \
diff --git a/scst_local/in-tree/Makefile-2.6.35 b/scst_local/in-tree/Makefile
similarity index 100%
rename from scst_local/in-tree/Makefile-2.6.35
rename to scst_local/in-tree/Makefile
diff --git a/scst_local/in-tree/Makefile-2.6.36 b/scst_local/in-tree/Makefile-2.6.36
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-2.6.36
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-2.6.37 b/scst_local/in-tree/Makefile-2.6.37
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-2.6.37
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-2.6.38 b/scst_local/in-tree/Makefile-2.6.38
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-2.6.38
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-2.6.39 b/scst_local/in-tree/Makefile-2.6.39
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-2.6.39
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.0 b/scst_local/in-tree/Makefile-3.0
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.0
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.1 b/scst_local/in-tree/Makefile-3.1
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.1
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.10 b/scst_local/in-tree/Makefile-3.10
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.10
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.11 b/scst_local/in-tree/Makefile-3.11
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.11
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.12 b/scst_local/in-tree/Makefile-3.12
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.12
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.13 b/scst_local/in-tree/Makefile-3.13
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.13
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.14 b/scst_local/in-tree/Makefile-3.14
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.14
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.15 b/scst_local/in-tree/Makefile-3.15
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.15
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.16 b/scst_local/in-tree/Makefile-3.16
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.16
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.17 b/scst_local/in-tree/Makefile-3.17
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.17
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.18 b/scst_local/in-tree/Makefile-3.18
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.18
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.19 b/scst_local/in-tree/Makefile-3.19
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.19
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.2 b/scst_local/in-tree/Makefile-3.2
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.3 b/scst_local/in-tree/Makefile-3.3
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.3
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.4 b/scst_local/in-tree/Makefile-3.4
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.4
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.5 b/scst_local/in-tree/Makefile-3.5
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.5
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.6 b/scst_local/in-tree/Makefile-3.6
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.6
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.7 b/scst_local/in-tree/Makefile-3.7
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.7
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.8 b/scst_local/in-tree/Makefile-3.8
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.8
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-3.9 b/scst_local/in-tree/Makefile-3.9
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-3.9
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.0 b/scst_local/in-tree/Makefile-4.0
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.1 b/scst_local/in-tree/Makefile-4.1
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.2 b/scst_local/in-tree/Makefile-4.2
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.3 b/scst_local/in-tree/Makefile-4.3
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.3
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.4 b/scst_local/in-tree/Makefile-4.4
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.4
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.5 b/scst_local/in-tree/Makefile-4.5
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.5
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-
diff --git a/scst_local/in-tree/Makefile-4.6 b/scst_local/in-tree/Makefile-4.6
deleted file mode 100644
index 8cbbbff63..000000000
--- a/scst_local/in-tree/Makefile-4.6
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SCST_LOCAL) += scst_local.o
-