diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config
index bea08f50c..3748845b2 100644
--- a/debian/arch/m68k/config
+++ b/debian/arch/m68k/config
@@ -278,6 +278,7 @@ CONFIG_DUMMY_CONSOLE=y
 # CONFIG_INFINIBAND is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT2_FS_XIP=n
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
 CONFIG_JBD=y
@@ -285,6 +286,7 @@ CONFIG_JBD=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_EXPORT=y
 # CONFIG_XFS_RT is not set
+CONFIG_XFS_QUOTA=n
 # CONFIG_XFS_SECURITY is not set
 # CONFIG_XFS_POSIX_ACL is not set
 CONFIG_SYSFS=y
diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga
index 010a38180..b45d35254 100644
--- a/debian/arch/m68k/config.amiga
+++ b/debian/arch/m68k/config.amiga
@@ -76,7 +76,7 @@ CONFIG_BLZ2060_SCSI=y
 CONFIG_BLZ1230_SCSI=y
 CONFIG_FASTLANE_SCSI=y
 CONFIG_SCSI_AMIGA7XX=y
-CONFIG_OKTAGON_SCSI=y
+CONFIG_OKTAGON_SCSI=n
 # CONFIG_SCSI_NCR53C7xx_FAST is not set
 # CONFIG_CD_NO_IDESCSI is not set
 # CONFIG_DM_MULTIPATH is not set
diff --git a/debian/arch/m68k/config.hp b/debian/arch/m68k/config.hp
index 15bdf8751..10bcb9294 100644
--- a/debian/arch/m68k/config.hp
+++ b/debian/arch/m68k/config.hp
@@ -35,12 +35,17 @@ CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+CONFIG_KEYBOARD_HIL_OLD=n
+CONFIG_KEYBOARD_HIL=n
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_HIL=n
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_MISC is not set
 CONFIG_SERIO=m
 CONFIG_SERIO_SERPORT=m
+CONFIG_HP_SDC=n
+CONFIG_HIL_MLC=n
 CONFIG_SERIO_LIBPS2=m
 # CONFIG_SERIAL_8250 is not set
 CONFIG_GEN_RTC=y
diff --git a/debian/changelog b/debian/changelog
index ff59a6cf4..c9c777833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,9 +60,11 @@ linux-2.6 (2.6.13-2) UNRELEASED; urgency=low
   [ Christian T. Steigies ]
   * disable CONFIG_EXT2_FS_XIP for m68k like on all(?) other arches
   * deactivate OKTAGON_SCSI for amiga/m68k until it can be compiled again
-  * deactivate CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL, and CONFIG_HIL_MLC for hp/m68k
-  * enable CONFIG_KEYBOARD_HIL_OLD, CONFIG_HP_SDC for hp/m68k
+  * deactivate CONFIG_KEYBOARD_HIL_OLD, CONFIG_KEYBOARD_HIL, CONFIG_MOUSE_HIL,
+    CONFIG_HIL_MLC, and CONFIG_HP_SDC for hp/m68k
   * update m68k.diff for 2.6.13
+  * split out patches that do not intefere with other arches to
+    patches-debian/m68k-*
 
  -- Simon Horman <horms@debian.org>  Tue, 11 Oct 2005 19:50:55 +0900
 
diff --git a/debian/patches-debian/series/2.6.13+2.6.14-rc4-1 b/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
index 65e4cb1b7..0f50d5efc 100644
--- a/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
+++ b/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
@@ -3,7 +3,12 @@
 + fbdev-radeon-noaccel.patch
 + fs-asfs-2.patch
 #+ ia64-irq-affinity-upfix.patch
-+ m68k-42_dma.patch 
+#- m68k-42_dma.patch
+#- m68k-sonic.patch
++ m68k-arch.patch
++ m68k-drivers.patch
++ m68k-kernel.patch
++ m68k-include-m68k.patch
 + modular-ide.patch
 + modular-ide-pnp.patch
 + powerpc-calibrate-tau.patch