diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index af4dc5a40..8307b56da 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -145,29 +145,11 @@ done
 
 # Directory drivers/infiniband/ulp/srpt/
 
-cat <<'EOF'
-diff -uprN orig/linux-2.6.24/drivers/infiniband/Kconfig linux-2.6.24/drivers/infiniband/Kconfig
---- orig/linux-2.6.24/drivers/infiniband/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/infiniband/Kconfig     2008-05-09 13:55:27.000000000 +0200
-@@ -51,6 +51,8 @@
+add_patch "srpt/src/Kconfig.infiniband.Linux-${kernel_version}.patch"  \
+          "linux-${kernel_version}/drivers/infiniband/Kconfig"
 
- source "drivers/infiniband/ulp/srp/Kconfig"
-
-+source "drivers/infiniband/ulp/srpt/Kconfig"
-+
- source "drivers/infiniband/ulp/iser/Kconfig"
-
- endif # INFINIBAND
-diff -uprN orig/linux-2.6.24/drivers/infiniband/Makefile linux-2.6.24/drivers/infiniband/Makefile
---- orig/linux-2.6.24/drivers/infiniband/Makefile	2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/drivers/infiniband/Makefile	2008-05-09 13:57:00.000000000 +0200
-@@ -7,4 +7,5 @@
- obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/
- obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/
- obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/
-+obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/
- obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/
-EOF
+add_patch "srpt/src/Makefile.infiniband.Linux-${kernel_version}.patch" \
+          "linux-${kernel_version}/drivers/infiniband/Makefile"
 
 add_file "srpt/src/Kconfig" "drivers/infiniband/ulp/srpt/Kconfig"
 
diff --git a/scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.24.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.24.patch
similarity index 100%
rename from scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.24.patch
rename to scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.24.patch
diff --git a/scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.7.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.7.patch
similarity index 100%
rename from scst/kernel/in-tree/Kconfig.scsi.Linux-2.6.7.patch
rename to scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.7.patch
diff --git a/scst/kernel/in-tree/Kconfig.scsi_tgt b/scst/kernel/in-tree/Kconfig.scst
similarity index 100%
rename from scst/kernel/in-tree/Kconfig.scsi_tgt
rename to scst/kernel/in-tree/Kconfig.scst
diff --git a/scst/kernel/in-tree/Makefile.scsi.Linux-2.6.15.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.15.patch
similarity index 100%
rename from scst/kernel/in-tree/Makefile.scsi.Linux-2.6.15.patch
rename to scst/kernel/in-tree/Makefile.drivers.Linux-2.6.15.patch
diff --git a/scst/kernel/in-tree/Makefile.scsi.Linux-2.6.24.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.24.patch
similarity index 100%
rename from scst/kernel/in-tree/Makefile.scsi.Linux-2.6.24.patch
rename to scst/kernel/in-tree/Makefile.drivers.Linux-2.6.24.patch
diff --git a/scst/kernel/in-tree/Makefile.scsi.Linux-2.6.7.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.7.patch
similarity index 100%
rename from scst/kernel/in-tree/Makefile.scsi.Linux-2.6.7.patch
rename to scst/kernel/in-tree/Makefile.drivers.Linux-2.6.7.patch
diff --git a/scst/kernel/in-tree/Makefile.scsi_tgt b/scst/kernel/in-tree/Makefile.scst
similarity index 100%
rename from scst/kernel/in-tree/Makefile.scsi_tgt
rename to scst/kernel/in-tree/Makefile.scst
diff --git a/srpt/src/Kconfig.infiniband.Linux-2.6.24.patch b/srpt/src/Kconfig.infiniband.Linux-2.6.24.patch
new file mode 100644
index 000000000..ff3cd5e1f
--- /dev/null
+++ b/srpt/src/Kconfig.infiniband.Linux-2.6.24.patch
@@ -0,0 +1,12 @@
+diff -uprN orig/linux-2.6.24/drivers/infiniband/Kconfig linux-2.6.24/drivers/infiniband/Kconfig
+--- orig/linux-2.6.24/drivers/infiniband/Kconfig        2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/infiniband/Kconfig     2008-05-09 13:55:27.000000000 +0200
+@@ -51,6 +51,8 @@
+
+ source "drivers/infiniband/ulp/srp/Kconfig"
+
++source "drivers/infiniband/ulp/srpt/Kconfig"
++
+ source "drivers/infiniband/ulp/iser/Kconfig"
+
+ endif # INFINIBAND
diff --git a/srpt/src/Makefile.infiniband.Linux-2.6.24.patch b/srpt/src/Makefile.infiniband.Linux-2.6.24.patch
new file mode 100644
index 000000000..909251197
--- /dev/null
+++ b/srpt/src/Makefile.infiniband.Linux-2.6.24.patch
@@ -0,0 +1,9 @@
+diff -uprN orig/linux-2.6.24/drivers/infiniband/Makefile linux-2.6.24/drivers/infiniband/Makefile
+--- orig/linux-2.6.24/drivers/infiniband/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/infiniband/Makefile	2008-05-09 13:57:00.000000000 +0200
+@@ -7,4 +7,5 @@
+ obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/
+ obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/
+ obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/
++obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/
+ obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/