diff --git a/toolchains/common/functions.sh b/toolchains/common/functions.sh
index 789076f..3416689 100755
--- a/toolchains/common/functions.sh
+++ b/toolchains/common/functions.sh
@@ -14,8 +14,13 @@ __do_clean_bdir () {
 }
 
 __do_patch () {
-	if [ -d "$PACKAGE_DIR/patches" ]; then
-		for p in "$PACKAGE_DIR/patches"/*.patch; do
+	local suffix
+	if [ -n "$1" ]; then
+		suffix="-$1"
+	fi
+
+	if [ -d "$PACKAGE_DIR/patches$suffix" ]; then
+		for p in "$PACKAGE_DIR/patches$suffix"/*.patch; do
 			echo "Applying $p"
 			patch -t -p1 < "$p"
 		done
diff --git a/toolchains/n64/packages/toolchain-mips64/build.sh b/toolchains/n64/packages/toolchain-mips64/build.sh
index 606e43c..331fc9a 100755
--- a/toolchains/n64/packages/toolchain-mips64/build.sh
+++ b/toolchains/n64/packages/toolchain-mips64/build.sh
@@ -31,11 +31,7 @@ cd ..
 
 # GCC...
 do_http_fetch gcc "https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.bz2" 'tar xjf'
-
-for p in "$PACKAGE_DIR/patches-gcc"/*.patch; do
-	echo "Applying $p"
-	patch -t -p1 < "$p"
-done
+do_patch gcc
 
 # Do off tree build
 GCC_DIR=$(pwd)
diff --git a/toolchains/openpandora/packages/gnutls/build.sh b/toolchains/openpandora/packages/gnutls/build.sh
index 2b639d4..a5a985e 100755
--- a/toolchains/openpandora/packages/gnutls/build.sh
+++ b/toolchains/openpandora/packages/gnutls/build.sh
@@ -60,8 +60,7 @@ cd ..
 
 do_http_fetch gnutls "http://ftp.gnu.org/gnu/gnutls/gnutls-${GNUTLS_VERSION}.tar.bz2" \
 	'tar xjf' "sha256:${GNUTLS_SHA256}"
-
-patch -t -p1 < $PACKAGE_DIR/gnutls-openssl.patch
+do_patch gnutls
 
 # Disable programs, doc and tests they don't even build...
 sed -ie 's/^\(SUBDIRS.*\) src doc tests/\1/' Makefile.in
diff --git a/toolchains/openpandora/packages/gnutls/gnutls-openssl.patch b/toolchains/openpandora/packages/gnutls/patches-gnutls/openssl.patch
similarity index 100%
rename from toolchains/openpandora/packages/gnutls/gnutls-openssl.patch
rename to toolchains/openpandora/packages/gnutls/patches-gnutls/openssl.patch
diff --git a/toolchains/windows-9x/packages/toolchain/build.sh b/toolchains/windows-9x/packages/toolchain/build.sh
index d975b3f..7f914a8 100755
--- a/toolchains/windows-9x/packages/toolchain/build.sh
+++ b/toolchains/windows-9x/packages/toolchain/build.sh
@@ -79,11 +79,7 @@ do_http_fetch w32api "https://osdn.net/dl/mingw/w32api-${W32API_VERSION}-mingw32
 cd ..
 
 do_http_fetch mingwrt "https://osdn.net/dl/mingw/mingwrt-${MINGWRT_VERSION}-mingw32-src.tar.xz" 'tar xJf'
-
-for p in "$PACKAGE_DIR/patches-mingwrt"/*.patch; do
-	echo "Applying $p"
-	patch -t -p1 < "$p"
-done
+do_patch mingwrt
 
 touch include/features.h