diff --git a/Ports/joe/package.sh b/Ports/joe/package.sh
index 8d4326e221..a2d3f7d46e 100755
--- a/Ports/joe/package.sh
+++ b/Ports/joe/package.sh
@@ -8,3 +8,4 @@ configopts=(
     "--disable-curses"
     "--disable-termcap"
 )
+use_fresh_config_sub=true
diff --git a/Ports/joe/patches/0001-Define-__USE_MISC-in-checkwidths.c.patch b/Ports/joe/patches/0001-Define-__USE_MISC-in-checkwidths.c.patch
index 13448e252b..d493fdd6fa 100644
--- a/Ports/joe/patches/0001-Define-__USE_MISC-in-checkwidths.c.patch
+++ b/Ports/joe/patches/0001-Define-__USE_MISC-in-checkwidths.c.patch
@@ -1,7 +1,7 @@
 From becc61b31858199a1cff4278bb2239d05ff9d38f Mon Sep 17 00:00:00 2001
 From: Snow <i@xkun.me>
 Date: Sun, 15 May 2022 11:41:03 +0800
-Subject: [PATCH 1/4] Define __USE_MISC in checkwidths.c
+Subject: [PATCH 1/3] Define __USE_MISC in checkwidths.c
 
 Define `__USE_MISC` manually in `checkwidths.c` for `ECHOCTL` and `ECHOKE`,
 see `Kernel/API/POSIX/termios.h`.
diff --git a/Ports/joe/patches/0002-Remove-the-sys-prefix-for-the-fcntl-include.patch b/Ports/joe/patches/0002-Remove-the-sys-prefix-for-the-fcntl-include.patch
index b957751856..e81fbd8a0d 100644
--- a/Ports/joe/patches/0002-Remove-the-sys-prefix-for-the-fcntl-include.patch
+++ b/Ports/joe/patches/0002-Remove-the-sys-prefix-for-the-fcntl-include.patch
@@ -1,7 +1,7 @@
 From 7136012c016c40b890ae4db5b3e4da4bf9b57caf Mon Sep 17 00:00:00 2001
 From: Snow <i@xkun.me>
 Date: Sun, 15 May 2022 11:41:03 +0800
-Subject: [PATCH 2/4] Remove the sys/ prefix for the fcntl include
+Subject: [PATCH 2/3] Remove the sys/ prefix for the fcntl include
 
 Serenity does not have the header `fcntl.h` in `/usr/include/sys`.
 ---
diff --git a/Ports/joe/patches/0003-Teach-config.sub-about-serenity.patch b/Ports/joe/patches/0003-Teach-config.sub-about-serenity.patch
deleted file mode 100644
index 56c57d5a78..0000000000
--- a/Ports/joe/patches/0003-Teach-config.sub-about-serenity.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0a0fd1875d7a58753e1c3da90e767e04ed06ef7f Mon Sep 17 00:00:00 2001
-From: Snow <i@xkun.me>
-Date: Sun, 15 May 2022 11:41:03 +0800
-Subject: [PATCH 3/4] Teach config.sub about serenity
-
----
- config.sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.sub b/config.sub
-index 9633db7..fe9a63e 100755
---- a/config.sub
-+++ b/config.sub
-@@ -1374,7 +1374,7 @@ case $os in
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -serenity*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
--- 
-2.36.1
-
diff --git a/Ports/joe/patches/0004-Undefine-TERMINFO-in-termcap.c.patch b/Ports/joe/patches/0003-Undefine-TERMINFO-in-termcap.c.patch
similarity index 90%
rename from Ports/joe/patches/0004-Undefine-TERMINFO-in-termcap.c.patch
rename to Ports/joe/patches/0003-Undefine-TERMINFO-in-termcap.c.patch
index 137b6532cc..ea5bc01f23 100644
--- a/Ports/joe/patches/0004-Undefine-TERMINFO-in-termcap.c.patch
+++ b/Ports/joe/patches/0003-Undefine-TERMINFO-in-termcap.c.patch
@@ -1,7 +1,7 @@
 From 07d7111359facb2e8ce95ca28743f3b38d991b25 Mon Sep 17 00:00:00 2001
 From: Snow <i@xkun.me>
 Date: Sun, 15 May 2022 11:41:03 +0800
-Subject: [PATCH 4/4] Undefine TERMINFO in termcap.c
+Subject: [PATCH 3/3] Undefine TERMINFO in termcap.c
 
 Leaving it defined will lead to a crash.
 ---
diff --git a/Ports/joe/patches/ReadMe.md b/Ports/joe/patches/ReadMe.md
index 5332bf9235..9e29b6bb8d 100644
--- a/Ports/joe/patches/ReadMe.md
+++ b/Ports/joe/patches/ReadMe.md
@@ -13,12 +13,7 @@ Remove the sys/ prefix for the fcntl include
 
 Serenity does not have the header `fcntl.h` in `/usr/include/sys`.
 
-## `0003-Teach-config.sub-about-serenity.patch`
-
-Teach config.sub about serenity
-
-
-## `0004-Undefine-TERMINFO-in-termcap.c.patch`
+## `0003-Undefine-TERMINFO-in-termcap.c.patch`
 
 Undefine TERMINFO in termcap.c