diff --git a/ports/bash/build.sh b/ports/bash/build.sh
index 0b625946..e9bfdae8 100755
--- a/ports/bash/build.sh
+++ b/ports/bash/build.sh
@@ -4,6 +4,7 @@ NAME='bash'
 VERSION='5.2.37'
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/bash/bash-$VERSION.tar.gz#9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff"
 DEPENDENCIES=('ncurses')
+CONFIG_SUB=('support/config.sub')
 CONFIGURE_OPTIONS=(
 	'--disable-nls'
 	'--without-bash-malloc'
diff --git a/ports/bash/patches/0001-Add-banan_os-target.patch b/ports/bash/patches/0001-Add-banan_os-target.patch
deleted file mode 100644
index 2cab57bd..00000000
--- a/ports/bash/patches/0001-Add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN bash-5.2.37/support/config.sub bash-5.2.37-banan_os/support/config.sub
---- bash-5.2.37/support/config.sub	2022-01-11 21:38:29.000000000 +0200
-+++ bash-5.2.37-banan_os/support/config.sub	2024-12-07 05:43:54.697086738 +0200
-@@ -1754,7 +1754,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* )
-+	     | fiwix* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/bash/patches/0002-Fix-non-multibyte-compilation.patch b/ports/bash/patches/0001-Fix-non-multibyte-compilation.patch
similarity index 100%
rename from ports/bash/patches/0002-Fix-non-multibyte-compilation.patch
rename to ports/bash/patches/0001-Fix-non-multibyte-compilation.patch
diff --git a/ports/bash/patches/0003-remove-cut-and-getconf-builtins.patch b/ports/bash/patches/0002-remove-cut-and-getconf-builtins.patch
similarity index 100%
rename from ports/bash/patches/0003-remove-cut-and-getconf-builtins.patch
rename to ports/bash/patches/0002-remove-cut-and-getconf-builtins.patch
diff --git a/ports/bochs/build.sh b/ports/bochs/build.sh
index 6ac52c5c..9aafe6c7 100755
--- a/ports/bochs/build.sh
+++ b/ports/bochs/build.sh
@@ -4,6 +4,7 @@ NAME='bochs'
 VERSION='3.0'
 DOWNLOAD_URL="https://sourceforge.net/projects/bochs/files/bochs/$VERSION/bochs-$VERSION.tar.gz#cb6f542b51f35a2cc9206b2a980db5602b7cd1b7cf2e4ed4f116acd5507781aa"
 DEPENDENCIES=('SDL2')
+CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	'--with-sdl2'
 	'--enable-x86-64'
diff --git a/ports/bochs/patches/0001-Add-banan_os-target.patch b/ports/bochs/patches/0001-Add-banan_os-target.patch
deleted file mode 100644
index 45ca57be..00000000
--- a/ports/bochs/patches/0001-Add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN bochs-2.8/config.sub bochs-2.8-banan_os/config.sub
---- bochs-2.8/config.sub	2024-03-10 08:59:37.000000000 +0200
-+++ bochs-2.8-banan_os/config.sub	2024-12-07 05:15:32.948901314 +0200
-@@ -1368,7 +1368,7 @@
- 	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
--	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
-+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* | banan_os*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	qnx*)
diff --git a/ports/bochs/patches/0002-Fix-includes.patch b/ports/bochs/patches/0001-Fix-includes.patch
similarity index 100%
rename from ports/bochs/patches/0002-Fix-includes.patch
rename to ports/bochs/patches/0001-Fix-includes.patch
diff --git a/ports/bochs/patches/0003-use-pkg-condif-for-SDL2.patch b/ports/bochs/patches/0002-use-pkg-condif-for-SDL2.patch
similarity index 100%
rename from ports/bochs/patches/0003-use-pkg-condif-for-SDL2.patch
rename to ports/bochs/patches/0002-use-pkg-condif-for-SDL2.patch
diff --git a/ports/curl/build.sh b/ports/curl/build.sh
index 8eb1c8f4..b68053dc 100755
--- a/ports/curl/build.sh
+++ b/ports/curl/build.sh
@@ -4,6 +4,7 @@ NAME='curl'
 VERSION='8.11.1'
 DOWNLOAD_URL="https://curl.se/download/curl-$VERSION.tar.gz#a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80"
 DEPENDENCIES=('ca-certificates' 'openssl' 'zlib' 'zstd')
+CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	'--disable-threaded-resolver'
 	'--disable-ipv6'
diff --git a/ports/curl/patches/0001-add-banan_os-target.patch b/ports/curl/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 24ba3d2c..00000000
--- a/ports/curl/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN curl-8.8.0/config.sub curl-patched/config.sub
---- curl-8.8.0/config.sub	2023-03-13 00:39:42.000000000 +0200
-+++ curl-patched/config.sub	2024-06-17 21:16:00.348556957 +0300
-@@ -1754,7 +1754,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* )
-+	     | fiwix* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/curl/patches/0002-add-shared-library-support.patch b/ports/curl/patches/0001-add-shared-library-support.patch
similarity index 100%
rename from ports/curl/patches/0002-add-shared-library-support.patch
rename to ports/curl/patches/0001-add-shared-library-support.patch
diff --git a/ports/expat/build.sh b/ports/expat/build.sh
index 33d1e4e9..a58d285c 100755
--- a/ports/expat/build.sh
+++ b/ports/expat/build.sh
@@ -3,3 +3,4 @@
 NAME='expat'
 VERSION='2.7.1'
 DOWNLOAD_URL="https://github.com/libexpat/libexpat/releases/download/R_2_7_1/expat-$VERSION.tar.gz#0cce2e6e69b327fc607b8ff264f4b66bdf71ead55a87ffd5f3143f535f15cfa2"
+CONFIG_SUB=('conftools/config.sub')
diff --git a/ports/expat/patches/0001-add-banan_os-target.patch b/ports/expat/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index b713264b..00000000
--- a/ports/expat/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN expat-2.7.1/conftools/config.sub expat-2.7.1-banan_os/conftools/config.sub
---- expat-2.7.1/conftools/config.sub	2022-07-27 15:26:54.000000000 +0300
-+++ expat-2.7.1-banan_os/conftools/config.sub	2025-06-17 11:51:49.876848002 +0300
-@@ -1775,7 +1775,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* )
-+	     | fiwix* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/gmp/build.sh b/ports/gmp/build.sh
index 12c70a7d..51977ba3 100755
--- a/ports/gmp/build.sh
+++ b/ports/gmp/build.sh
@@ -3,6 +3,7 @@
 NAME='gmp'
 VERSION='6.3.0'
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/gmp/gmp-$VERSION.tar.xz#a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898"
+CONFIG_SUB=('configfsf.sub')
 
 # configure does not work with (default) c23
 export CFLAGS="--std=c17 $CFLAGS"
diff --git a/ports/gmp/patches/0001-add-banan_os-target.patch b/ports/gmp/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 671e3d3e..00000000
--- a/ports/gmp/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gmp-6.3.0/configfsf.sub gmp-6.3.0-banan_os/configfsf.sub
---- gmp-6.3.0/configfsf.sub	2023-07-29 16:42:16.000000000 +0300
-+++ gmp-6.3.0-banan_os/configfsf.sub	2024-08-07 21:37:12.147551767 +0300
-@@ -1759,7 +1759,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* | mlibc* )
-+	     | fiwix* | mlibc* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/libjpeg/build.sh b/ports/libjpeg/build.sh
index e0ffaec8..4fb636ac 100755
--- a/ports/libjpeg/build.sh
+++ b/ports/libjpeg/build.sh
@@ -4,6 +4,7 @@ NAME='libjpeg'
 VERSION='9f'
 DOWNLOAD_URL="https://www.ijg.org/files/jpegsrc.v9f.tar.gz#04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b"
 TAR_CONTENT="jpeg-$VERSION"
+CONFIG_SUB=('config.sub')
 
 post_install() {
 	# remove libtool files
diff --git a/ports/libjpeg/patches/0001-add-banan_os-target.patch b/ports/libjpeg/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 928674b9..00000000
--- a/ports/libjpeg/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN jpeg-9f/config.sub jpeg-9f-banan_os/config.sub
---- jpeg-9f/config.sub	2024-01-08 19:38:48.000000000 +0200
-+++ jpeg-9f-banan_os/config.sub	2025-06-11 10:57:34.463953673 +0300
-@@ -1748,7 +1748,8 @@
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
--	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
-+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-+	     | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/libjpeg/patches/0002-build-shared-libraries.patch b/ports/libjpeg/patches/0001-build-shared-libraries.patch
similarity index 100%
rename from ports/libjpeg/patches/0002-build-shared-libraries.patch
rename to ports/libjpeg/patches/0001-build-shared-libraries.patch
diff --git a/ports/libpng/build.sh b/ports/libpng/build.sh
index 80a2b95e..ba39e54b 100755
--- a/ports/libpng/build.sh
+++ b/ports/libpng/build.sh
@@ -4,6 +4,7 @@ NAME='libpng'
 VERSION='1.6.48'
 DOWNLOAD_URL="https://download.sourceforge.net/libpng/libpng-$VERSION.tar.gz#68f3d83a79d81dfcb0a439d62b411aa257bb4973d7c67cd1ff8bdf8d011538cd"
 DEPENDENCIES=('zlib')
+CONFIG_SUB=('config.sub')
 
 post_install() {
 	# remove libtool files
diff --git a/ports/libpng/patches/0001-add-banan_os-target.patch b/ports/libpng/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 0e3c5757..00000000
--- a/ports/libpng/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libpng-1.6.48/config.sub libpng-1.6.48-banan_os/config.sub
---- libpng-1.6.48/config.sub	2025-04-30 16:51:46.000000000 +0300
-+++ libpng-1.6.48-banan_os/config.sub	2025-06-10 14:07:16.060041002 +0300
-@@ -1768,7 +1768,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
-+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/libpng/patches/0002-build-shared-libraries.patch b/ports/libpng/patches/0001-build-shared-libraries.patch
similarity index 100%
rename from ports/libpng/patches/0002-build-shared-libraries.patch
rename to ports/libpng/patches/0001-build-shared-libraries.patch
diff --git a/ports/libtiff/build.sh b/ports/libtiff/build.sh
index d69ec4c0..66abf9d3 100755
--- a/ports/libtiff/build.sh
+++ b/ports/libtiff/build.sh
@@ -5,6 +5,7 @@ VERSION='4.7.0'
 DOWNLOAD_URL="https://download.osgeo.org/libtiff/tiff-$VERSION.tar.gz#67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976"
 TAR_CONTENT="tiff-$VERSION"
 DEPENDENCIES=('zlib' 'zstd' 'libjpeg')
+CONFIG_SUB=('config/config.sub')
 
 post_install() {
 	# remove libtool files
diff --git a/ports/libtiff/patches/0001-add-banan_os-target.patch b/ports/libtiff/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 87bc574c..00000000
--- a/ports/libtiff/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN tiff-4.7.0/config/config.sub tiff-4.7.0-banan_os/config/config.sub
---- tiff-4.7.0/config/config.sub	2024-09-11 10:38:00.000000000 +0300
-+++ tiff-4.7.0-banan_os/config/config.sub	2025-06-11 12:55:18.797614388 +0300
-@@ -1976,6 +1976,7 @@
- 	| atheos* \
- 	| auroraux* \
- 	| aux* \
-+	| banan_os* \
- 	| beos* \
- 	| bitrig* \
- 	| bme* \
diff --git a/ports/libtiff/patches/0002-build-shared-libraries.patch b/ports/libtiff/patches/0001-build-shared-libraries.patch
similarity index 100%
rename from ports/libtiff/patches/0002-build-shared-libraries.patch
rename to ports/libtiff/patches/0001-build-shared-libraries.patch
diff --git a/ports/libwebp/build.sh b/ports/libwebp/build.sh
index 729f835f..893279c3 100755
--- a/ports/libwebp/build.sh
+++ b/ports/libwebp/build.sh
@@ -4,6 +4,7 @@ NAME='libwebp'
 VERSION='1.5.0'
 DOWNLOAD_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$VERSION.tar.gz#7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"
 DEPENDENCIES=('libpng' 'libjpeg' 'libtiff')
+CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	"--with-pngincludedir=$BANAN_SYSROOT/usr/include"
 	"--with-pnglibdir=$BANAN_SYSROOT/usr/lib"
diff --git a/ports/libwebp/patches/0001-add-banan_os-target.patch b/ports/libwebp/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 142d0106..00000000
--- a/ports/libwebp/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libwebp-1.5.0/config.sub libwebp-1.5.0-banan_os/config.sub
---- libwebp-1.5.0/config.sub	2024-12-20 03:52:53.000000000 +0200
-+++ libwebp-1.5.0-banan_os/config.sub	2025-06-11 12:46:06.199497350 +0300
-@@ -1754,7 +1754,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* )
-+	     | fiwix* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/libwebp/patches/0002-build-shared-libraries.patch b/ports/libwebp/patches/0001-build-shared-libraries.patch
similarity index 100%
rename from ports/libwebp/patches/0002-build-shared-libraries.patch
rename to ports/libwebp/patches/0001-build-shared-libraries.patch
diff --git a/ports/lynx/build.sh b/ports/lynx/build.sh
index 5df99e5f..0177721e 100755
--- a/ports/lynx/build.sh
+++ b/ports/lynx/build.sh
@@ -5,6 +5,7 @@ VERSION='2.9.2'
 DOWNLOAD_URL="https://invisible-island.net/archives/lynx/tarballs/lynx$VERSION.tar.gz#99f8f28f860094c533100d1cedf058c27fb242ce25e991e2d5f30ece4457a3bf"
 TAR_CONTENT="lynx$VERSION"
 DEPENDENCIES=('ncurses' 'ca-certificates' 'openssl' 'zlib')
+CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	'--without-system-type'
 	'--with-sceen=ncurses'
diff --git a/ports/lynx/patches/0001-add-banan_os-target.patch b/ports/lynx/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index c89dce7a..00000000
--- a/ports/lynx/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN lynx2.9.2/config.sub lynx2.9.2-banan_os/config.sub
---- lynx2.9.2/config.sub	2023-12-27 16:41:27.000000000 +0200
-+++ lynx2.9.2-banan_os/config.sub	2024-08-21 14:23:47.519364107 +0300
-@@ -1768,7 +1768,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
-+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/make/build.sh b/ports/make/build.sh
index 67dc935e..9bceefd1 100755
--- a/ports/make/build.sh
+++ b/ports/make/build.sh
@@ -3,6 +3,7 @@
 NAME='make'
 VERSION='4.4.1'
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/make/make-$VERSION.tar.gz#dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3"
+CONFIG_SUB=('build-aux/config.sub')
 CONFIGURE_OPTIONS=(
 	'--with-sysroot=/'
 	'--disable-nls'
diff --git a/ports/make/patches/0001-Add-banan_os-target.patch b/ports/make/patches/0001-Add-banan_os-target.patch
deleted file mode 100644
index d3e3f3cd..00000000
--- a/ports/make/patches/0001-Add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN make-4.4.1/build-aux/config.sub make-4.4.1-banan_os/build-aux/config.sub
---- make-4.4.1/build-aux/config.sub	2023-02-18 17:38:13.000000000 +0200
-+++ make-4.4.1-banan_os/build-aux/config.sub	2024-12-04 23:15:11.865989888 +0200
-@@ -1758,7 +1758,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* | mlibc* )
-+	     | fiwix* | mlibc* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/make/patches/0002-Include-ar.h-on-banan_os.patch b/ports/make/patches/0001-Include-ar.h-on-banan_os.patch
similarity index 100%
rename from ports/make/patches/0002-Include-ar.h-on-banan_os.patch
rename to ports/make/patches/0001-Include-ar.h-on-banan_os.patch
diff --git a/ports/mpc/build.sh b/ports/mpc/build.sh
index e37c8f70..fbaa8150 100755
--- a/ports/mpc/build.sh
+++ b/ports/mpc/build.sh
@@ -4,6 +4,7 @@ NAME='mpc'
 VERSION='1.3.1'
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/mpc/mpc-$VERSION.tar.gz#ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8"
 DEPENDENCIES=('gmp' 'mpfr')
+CONFIG_SUB=('build-aux/config.sub')
 CONFIGURE_OPTIONS=(
 	"--target=$BANAN_TOOLCHAIN_TRIPLE"
 	"--with-sysroot=$BANAN_SYSROOT"
diff --git a/ports/mpc/patches/0001-add-banan_os-target.patch b/ports/mpc/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index c6e1e7f7..00000000
--- a/ports/mpc/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN mpc-1.3.1/build-aux/config.sub mpc-1.3.1-banan_os/build-aux/config.sub
---- mpc-1.3.1/build-aux/config.sub	2022-12-08 14:23:21.000000000 +0200
-+++ mpc-1.3.1-banan_os/build-aux/config.sub	2024-08-07 22:52:40.072912471 +0300
-@@ -1748,7 +1748,8 @@
- 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
--	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
-+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-+	     | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/mpfr/build.sh b/ports/mpfr/build.sh
index 36ffb1c6..9dd014d5 100755
--- a/ports/mpfr/build.sh
+++ b/ports/mpfr/build.sh
@@ -4,6 +4,7 @@ NAME='mpfr'
 VERSION='4.2.2'
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/mpfr/mpfr-$VERSION.tar.gz#826cbb24610bd193f36fde172233fb8c009f3f5c2ad99f644d0dea2e16a20e42"
 DEPENDENCIES=('gmp')
+CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	"--target=$BANAN_TOOLCHAIN_TRIPLE"
 	'--with-sysroot=/'
diff --git a/ports/mpfr/patches/0001-add-banan_os-target.patch b/ports/mpfr/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 0fed95ae..00000000
--- a/ports/mpfr/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN mpfr-4.2.1/config.sub mpfr-4.2.1-banan_os/config.sub
---- mpfr-4.2.1/config.sub	2023-08-22 10:47:14.000000000 +0300
-+++ mpfr-4.2.1-banan_os/config.sub	2024-08-07 22:48:27.798804026 +0300
-@@ -1754,7 +1754,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* )
-+	     | fiwix* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/nasm/build.sh b/ports/nasm/build.sh
index bdeeec03..9a96e3e2 100755
--- a/ports/nasm/build.sh
+++ b/ports/nasm/build.sh
@@ -3,6 +3,7 @@
 NAME='nasm'
 VERSION='2.16.03'
 DOWNLOAD_URL="https://www.nasm.us/pub/nasm/releasebuilds/$VERSION/nasm-$VERSION.tar.gz#5bc940dd8a4245686976a8f7e96ba9340a0915f2d5b88356874890e207bdb581"
+CONFIG_SUB=('autoconf/helpers/config.sub')
 CONFIGURE_OPTIONS=(
 	'--disable-gdb'
 )
diff --git a/ports/nasm/patches/0001-add-banan_os-target.patch b/ports/nasm/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 95999285..00000000
--- a/ports/nasm/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN nasm-2.16.03/autoconf/helpers/config.sub nasm-2.16.03-banan_os/autoconf/helpers/config.sub
---- nasm-2.16.03/autoconf/helpers/config.sub	2024-04-17 20:04:08.000000000 +0300
-+++ nasm-2.16.03-banan_os/autoconf/helpers/config.sub	2024-08-18 18:47:13.768447183 +0300
-@@ -1754,7 +1754,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* )
-+	     | fiwix* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/nasm/patches/0002-do-not-pass-t-to-fopen.patch b/ports/nasm/patches/0001-do-not-pass-t-to-fopen.patch
similarity index 100%
rename from ports/nasm/patches/0002-do-not-pass-t-to-fopen.patch
rename to ports/nasm/patches/0001-do-not-pass-t-to-fopen.patch
diff --git a/ports/ncurses/build.sh b/ports/ncurses/build.sh
index b4e83b66..bc6d780b 100755
--- a/ports/ncurses/build.sh
+++ b/ports/ncurses/build.sh
@@ -3,6 +3,7 @@
 NAME='ncurses'
 VERSION='6.5'
 DOWNLOAD_URL="https://ftp.gnu.org/gnu/ncurses/ncurses-$VERSION.tar.gz#136d91bc269a9a5785e5f9e980bc76ab57428f604ce3e5a5a90cebc767971cc6"
+CONFIG_SUB=('config.sub')
 CONFIGURE_OPTIONS=(
 	"--with-pkg-config='$PKG_CONFIG'"
 	"--with-pkg-config-libdir=/usr/lib/pkgconfig"
diff --git a/ports/ncurses/patches/0001-add-banan_os-target.patch b/ports/ncurses/patches/0001-add-banan_os-target.patch
deleted file mode 100644
index 0b50f5a3..00000000
--- a/ports/ncurses/patches/0001-add-banan_os-target.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN ncurses-6.5/config.sub ncurses-6.5-banan_os/config.sub
---- ncurses-6.5/config.sub	2023-12-27 16:41:27.000000000 +0200
-+++ ncurses-6.5-banan_os/config.sub	2025-04-19 05:53:50.863635047 +0300
-@@ -1768,7 +1768,7 @@
- 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
--	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
-+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* | banan_os* )
- 		;;
- 	# This one is extra strict with allowed versions
- 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/ports/ncurses/patches/0002-add-shared-library-support.patch b/ports/ncurses/patches/0001-add-shared-library-support.patch
similarity index 100%
rename from ports/ncurses/patches/0002-add-shared-library-support.patch
rename to ports/ncurses/patches/0001-add-shared-library-support.patch