diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index b1ca62ee6..0f95ca0d9 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -1649,3 +1649,4 @@ CONFIG_I6300ESB_WDT=m
 CONFIG_USB_SUSPEND=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_PM_LEGACY=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index e55acc367..501add557 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -1911,3 +1911,4 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
diff --git a/debian/arch/i386/config.486 b/debian/arch/i386/config.486
index e0d953f22..9b157efcb 100644
--- a/debian/arch/i386/config.486
+++ b/debian/arch/i386/config.486
@@ -1,4 +1,3 @@
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_M486=y
 # CONFIG_M686 is not set
 # CONFIG_MK7 is not set
diff --git a/debian/arch/i386/config.686 b/debian/arch/i386/config.686
index 8fe010657..16900e5be 100644
--- a/debian/arch/i386/config.686
+++ b/debian/arch/i386/config.686
@@ -1,4 +1,3 @@
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_M386 is not set
 CONFIG_M686=y
 # CONFIG_MK7 is not set
diff --git a/debian/arch/i386/config.686-smp b/debian/arch/i386/config.686-smp
index 82b50d1cf..93fafc64e 100644
--- a/debian/arch/i386/config.686-smp
+++ b/debian/arch/i386/config.686-smp
@@ -1,6 +1,5 @@
 CONFIG_LOCK_KERNEL=y
 # CONFIG_CPUSETS is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 CONFIG_M686=y
diff --git a/debian/arch/i386/config.k7 b/debian/arch/i386/config.k7
index 132f8be98..068444a2c 100644
--- a/debian/arch/i386/config.k7
+++ b/debian/arch/i386/config.k7
@@ -1,4 +1,3 @@
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_M386 is not set
 # CONFIG_M686 is not set
 CONFIG_MK7=y
diff --git a/debian/arch/i386/config.k7-smp b/debian/arch/i386/config.k7-smp
index b210d6521..26413723a 100644
--- a/debian/arch/i386/config.k7-smp
+++ b/debian/arch/i386/config.k7-smp
@@ -1,6 +1,5 @@
 CONFIG_LOCK_KERNEL=y
 # CONFIG_CPUSETS is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_STOP_MACHINE=y
 # CONFIG_M386 is not set
 # CONFIG_M686 is not set
diff --git a/debian/changelog b/debian/changelog
index 5e0df7258..cf8aaafbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.14+2.6.15-rc6-0experimental.1) UNRELEASED; urgency=low
 
   [ Kyle McMartin ]
   * Change parisc kernel names to something less ambiguous.
@@ -20,7 +20,6 @@ linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low
 
   [ Frederik Schüler ]
   * Add updated version of drivers-scsi-megaraid_splitup.patch.
-    (Closes: #317258)
   * Deactivate CONFIG_IDE_TASK_IOCTL on alpha and ia64 and make it a global
     option.
 
diff --git a/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.2 b/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.2
deleted file mode 100644
index c4f708e10..000000000
--- a/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.2
+++ /dev/null
@@ -1 +0,0 @@
-+ drivers-scsi-megaraid_splitup.patch
diff --git a/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.1 b/debian/patches-debian/series/2.6.14+2.6.15-rc6-0experimental.1
similarity index 94%
rename from debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.1
rename to debian/patches-debian/series/2.6.14+2.6.15-rc6-0experimental.1
index 37e95a293..8f8c30447 100644
--- a/debian/patches-debian/series/2.6.14+2.6.15-rc5-0experimental.1
+++ b/debian/patches-debian/series/2.6.14+2.6.15-rc6-0experimental.1
@@ -21,3 +21,4 @@
 + m68k-spinlock.patch
 + sparc64-atyfb-xl-gr.patch
 + powerpc-arch-default-powerpc.patch
++ drivers-scsi-megaraid_splitup.patch