diff --git a/debian/rules b/debian/rules
index 7542e8db..a26a9d0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,8 +64,10 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 endif
 
 	# Apply our patches to Wine
-	for FILE in `ls $(CURDIR)/patches`; do \
-		patch -N -p0 --strip=1 < $(CURDIR)/patches/$$FILE || exit 1; \
+	for DIR in $(find $(CURDIR)/patches/ -type d | sort); do \
+		for FILE in $(ls $$DIR | sort); do \
+			patch -N -p0 --strip=1 < $$DIR/$$FILE || exit 1; \
+		done
 	done
 
 	# Update the configure script
diff --git a/generate-patchlist.sh b/generate-patchlist.sh
index 5d435a84..68da88f0 100755
--- a/generate-patchlist.sh
+++ b/generate-patchlist.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PATCH_DATA="";
-for FILE in patches/*.patch; do
+for FILE in patches/*.patch patches/*/*.patch; do
 	MD5SUM=$(md5sum "${FILE}" | sed 's| .*||g');
 	AUTHOR=$(cat "${FILE}" | sed -n 's|From: \([^<]*\).*|\1|p' | sed -e 's|"||g' -e 's| $||g');
 	TITLE=$(cat "${FILE}" | sed -n '1!N; s|Subject: \(.*\)\n|\1|p');