diff --git a/debian/patches-debian/TODO b/debian/patches/TODO
similarity index 100%
rename from debian/patches-debian/TODO
rename to debian/patches/TODO
diff --git a/debian/patches-debian/drivers-scsi-megaraid_splitup.patch b/debian/patches/drivers-scsi-megaraid_splitup.patch
similarity index 100%
rename from debian/patches-debian/drivers-scsi-megaraid_splitup.patch
rename to debian/patches/drivers-scsi-megaraid_splitup.patch
diff --git a/debian/patches-debian/fbdev-radeon-noaccel.patch b/debian/patches/fbdev-radeon-noaccel.patch
similarity index 100%
rename from debian/patches-debian/fbdev-radeon-noaccel.patch
rename to debian/patches/fbdev-radeon-noaccel.patch
diff --git a/debian/patches-debian/fs-asfs-2.patch b/debian/patches/fs-asfs-2.patch
similarity index 100%
rename from debian/patches-debian/fs-asfs-2.patch
rename to debian/patches/fs-asfs-2.patch
diff --git a/debian/patches-debian/hppa-incompatible.patch b/debian/patches/hppa-incompatible.patch
similarity index 100%
rename from debian/patches-debian/hppa-incompatible.patch
rename to debian/patches/hppa-incompatible.patch
diff --git a/debian/patches-debian/ia64-irq-affinity-upfix.patch b/debian/patches/ia64-irq-affinity-upfix.patch
similarity index 100%
rename from debian/patches-debian/ia64-irq-affinity-upfix.patch
rename to debian/patches/ia64-irq-affinity-upfix.patch
diff --git a/debian/patches-debian/m68k-bvme.patch b/debian/patches/m68k-bvme.patch
similarity index 100%
rename from debian/patches-debian/m68k-bvme.patch
rename to debian/patches/m68k-bvme.patch
diff --git a/debian/patches-debian/m68k-incompatible.patch b/debian/patches/m68k-incompatible.patch
similarity index 100%
rename from debian/patches-debian/m68k-incompatible.patch
rename to debian/patches/m68k-incompatible.patch
diff --git a/debian/patches-debian/m68k-mvme147.patch b/debian/patches/m68k-mvme147.patch
similarity index 100%
rename from debian/patches-debian/m68k-mvme147.patch
rename to debian/patches/m68k-mvme147.patch
diff --git a/debian/patches-debian/m68k-mvme16x.patch b/debian/patches/m68k-mvme16x.patch
similarity index 100%
rename from debian/patches-debian/m68k-mvme16x.patch
rename to debian/patches/m68k-mvme16x.patch
diff --git a/debian/patches-debian/m68k-spinlock.patch b/debian/patches/m68k-spinlock.patch
similarity index 100%
rename from debian/patches-debian/m68k-spinlock.patch
rename to debian/patches/m68k-spinlock.patch
diff --git a/debian/patches-debian/modular-ide-pnp.patch b/debian/patches/modular-ide-pnp.patch
similarity index 100%
rename from debian/patches-debian/modular-ide-pnp.patch
rename to debian/patches/modular-ide-pnp.patch
diff --git a/debian/patches-debian/powerpc-apus.patch b/debian/patches/powerpc-apus.patch
similarity index 100%
rename from debian/patches-debian/powerpc-apus.patch
rename to debian/patches/powerpc-apus.patch
diff --git a/debian/patches-debian/powerpc-arch-default-powerpc.patch b/debian/patches/powerpc-arch-default-powerpc.patch
similarity index 100%
rename from debian/patches-debian/powerpc-arch-default-powerpc.patch
rename to debian/patches/powerpc-arch-default-powerpc.patch
diff --git a/debian/patches-debian/powerpc-build-links.patch b/debian/patches/powerpc-build-links.patch
similarity index 100%
rename from debian/patches-debian/powerpc-build-links.patch
rename to debian/patches/powerpc-build-links.patch
diff --git a/debian/patches-debian/powerpc-calibrate-tau.patch b/debian/patches/powerpc-calibrate-tau.patch
similarity index 100%
rename from debian/patches-debian/powerpc-calibrate-tau.patch
rename to debian/patches/powerpc-calibrate-tau.patch
diff --git a/debian/patches-debian/powerpc-g3-750cxe.patch b/debian/patches/powerpc-g3-750cxe.patch
similarity index 100%
rename from debian/patches-debian/powerpc-g3-750cxe.patch
rename to debian/patches/powerpc-g3-750cxe.patch
diff --git a/debian/patches-debian/powerpc-mkvmlinuz-support.patch b/debian/patches/powerpc-mkvmlinuz-support.patch
similarity index 100%
rename from debian/patches-debian/powerpc-mkvmlinuz-support.patch
rename to debian/patches/powerpc-mkvmlinuz-support.patch
diff --git a/debian/patches-debian/powerpc-mv643xx-hotplug-support.patch b/debian/patches/powerpc-mv643xx-hotplug-support.patch
similarity index 100%
rename from debian/patches-debian/powerpc-mv643xx-hotplug-support.patch
rename to debian/patches/powerpc-mv643xx-hotplug-support.patch
diff --git a/debian/patches-debian/powerpc-mv643xx-spinlock-fix-support.patch b/debian/patches/powerpc-mv643xx-spinlock-fix-support.patch
similarity index 100%
rename from debian/patches-debian/powerpc-mv643xx-spinlock-fix-support.patch
rename to debian/patches/powerpc-mv643xx-spinlock-fix-support.patch
diff --git a/debian/patches-debian/powerpc-prep-utah-ide-interrupt.patch b/debian/patches/powerpc-prep-utah-ide-interrupt.patch
similarity index 100%
rename from debian/patches-debian/powerpc-prep-utah-ide-interrupt.patch
rename to debian/patches/powerpc-prep-utah-ide-interrupt.patch
diff --git a/debian/patches-debian/powerpc-serial.patch b/debian/patches/powerpc-serial.patch
similarity index 100%
rename from debian/patches-debian/powerpc-serial.patch
rename to debian/patches/powerpc-serial.patch
diff --git a/debian/patches-debian/remove-references-to-removed-drivers.patch b/debian/patches/remove-references-to-removed-drivers.patch
similarity index 100%
rename from debian/patches-debian/remove-references-to-removed-drivers.patch
rename to debian/patches/remove-references-to-removed-drivers.patch
diff --git a/debian/patches-debian/s390-uaccess-const.patch b/debian/patches/s390-uaccess-const.patch
similarity index 100%
rename from debian/patches-debian/s390-uaccess-const.patch
rename to debian/patches/s390-uaccess-const.patch
diff --git a/debian/patches-debian/series/1 b/debian/patches/series/1
similarity index 100%
rename from debian/patches-debian/series/1
rename to debian/patches/series/1
diff --git a/debian/patches-debian/series/2-extra b/debian/patches/series/2-extra
similarity index 100%
rename from debian/patches-debian/series/2-extra
rename to debian/patches/series/2-extra
diff --git a/debian/patches-debian/sparc64-atyfb-xl-gr-final.patch b/debian/patches/sparc64-atyfb-xl-gr-final.patch
similarity index 100%
rename from debian/patches-debian/sparc64-atyfb-xl-gr-final.patch
rename to debian/patches/sparc64-atyfb-xl-gr-final.patch
diff --git a/debian/patches-debian/sparc64-hme-lockup.patch b/debian/patches/sparc64-hme-lockup.patch
similarity index 100%
rename from debian/patches-debian/sparc64-hme-lockup.patch
rename to debian/patches/sparc64-hme-lockup.patch
diff --git a/debian/patches-debian/tty-locking-fixes9.patch b/debian/patches/tty-locking-fixes9.patch
similarity index 100%
rename from debian/patches-debian/tty-locking-fixes9.patch
rename to debian/patches/tty-locking-fixes9.patch
diff --git a/debian/patches-debian/version.patch b/debian/patches/version.patch
similarity index 100%
rename from debian/patches-debian/version.patch
rename to debian/patches/version.patch
diff --git a/debian/rules.real b/debian/rules.real
index 734b17b3e..155737320 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -106,7 +106,7 @@ $(BUILD_DIR)/linux-source-$(UPSTREAM_VERSION).tar.bz2: $(STAMPS_DIR)/source
 	rm -rf '$(DIR)'
 
 define patch_cmd
-cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches-debian' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
+cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCE_VERSION)' --overwrite-revisions='$(REVISIONS)'
 endef
 
 srcfiles := $(filter-out debian, $(wildcard *))
@@ -251,7 +251,7 @@ install-patch:
 	dh_testroot
 	dh_clean -d -k $(DH_OPTIONS)
 	dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
-	dh_install $(DH_OPTIONS) debian/patches-debian/* '$(pbase)/debian'
+	dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
 #	Install the debian patches
 	sed \
 	  -e 's,@home@,$(pbase)/debian,' \