diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index c7e00c58d6..8830c0917f 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -86,7 +86,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
 | [`mbedtls`](mbedtls/)                  | Mbed TLS                                                   | 2.16.2                   | https://tls.mbed.org/                                                          |
 | [`milkytracker`](milkytracker/)        | milkytracker                                               | 1.03.00                  | https://github.com/milkytracker/MilkyTracker                                   |
 | [`mrsh`](mrsh/)                        | mrsh                                                       | d9763a3                  | https://mrsh.sh/                                                               |
-| [`nano`](nano/)                        | GNU nano                                                   | 4.5                      | https://www.nano-editor.org/                                                   |
+| [`nano`](nano/)                        | GNU nano                                                   | 5.8                      | https://www.nano-editor.org/                                                   |
 | [`nasm`](nasm/)                        | Netwide Assembler (NASM)                                   | 2.15.05                  | https://www.nasm.us/                                                           |
 | [`ncurses`](ncurses/)                  | ncurses                                                    | 6.2                      | https://invisible-island.net/ncurses/announce.html                             |
 | [`neofetch`](neofetch/)                | neofetch                                                   | 7.1.0                    | https://github.com/dylanaraps/neofetch                                         |
diff --git a/Ports/nano/package.sh b/Ports/nano/package.sh
index 42f6f4b096..1b2b450e3c 100755
--- a/Ports/nano/package.sh
+++ b/Ports/nano/package.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=nano
-version=4.5
+version=5.8
 useconfigure="true"
-files="https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz nano-${version}.tar.xz
-https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz.asc nano-${version}.tar.xz.asc"
+files="https://www.nano-editor.org/dist/v5/nano-${version}.tar.xz nano-${version}.tar.xz
+https://www.nano-editor.org/dist/v5/nano-${version}.tar.xz.asc nano-${version}.tar.xz.asc"
 configopts="--target=${SERENITY_ARCH}-pc-serenity --disable-browser --disable-utf8"
 depends="ncurses"
 auth_type="sig"
diff --git a/Ports/nano/patches/fix-autoconf.patch b/Ports/nano/patches/fix-autoconf.patch
index 4129cb774a..48ca66b975 100644
--- a/Ports/nano/patches/fix-autoconf.patch
+++ b/Ports/nano/patches/fix-autoconf.patch
@@ -1,12 +1,12 @@
-diff -ru nano-4.5-original/nano-4.5/config.sub nano-4.5/config.sub
---- nano-4.5-original/nano-4.5/config.sub	2018-11-10 00:30:37.000000000 -0600
-+++ nano-4.5/config.sub	2019-11-13 01:52:22.442486361 -0600
-@@ -1369,6 +1369,7 @@
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- 	      | -aos* | -aros* | -cloudabi* | -sortix* \
-+		  | -serenity* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
-
+diff --git a/config.sub.orig b/config.sub
+index 63c1f1c8b..f14d29e3d 100755
+--- a/config.sub.orig
++++ b/config.sub
+@@ -1696,6 +1696,7 @@ case $os in
+ 	# The portable systems comes first.
+ 	# Each alternative MUST end in a * to match a version number.
+ 	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
++	     | serenity* \
+ 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+ 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
diff --git a/Ports/nano/patches/fix-files.patch b/Ports/nano/patches/fix-files.patch
deleted file mode 100644
index 80b3ad24a3..0000000000
--- a/Ports/nano/patches/fix-files.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru nano-4.5-original/nano-4.5/src/files.c nano-4.5/src/files.c
---- nano-4.5-original/nano-4.5/src/files.c	2019-10-04 04:38:05.000000000 -0500
-+++ nano-4.5/src/files.c	2019-11-13 02:17:33.268207958 -0600
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- 
- #define LOCKBUFSIZE 8192
-+#define P_tmpdir        "/tmp"
- 
- /* Verify that the containing directory of the given filename exists. */
- bool has_valid_path(const char *filename)
-
diff --git a/Ports/nano/patches/fix-fnmatch.patch b/Ports/nano/patches/fix-fnmatch.patch
deleted file mode 100644
index ee5970bdd2..0000000000
--- a/Ports/nano/patches/fix-fnmatch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur nano-4.5/lib/fnmatch_loop.c nano-4.5.serenity/lib/fnmatch_loop.c
---- nano-4.5/lib/fnmatch_loop.c	2021-04-12 03:21:50.410647764 +0200
-+++ nano-4.5.serenity/lib/fnmatch_loop.c	2021-04-12 03:20:03.688773104 +0200
-@@ -16,6 +16,9 @@
- 
- /* Match STRING against the file name pattern PATTERN, returning zero if
-    it matches, nonzero if not.  */
-+#ifdef __serenity__
-+#define FNM_EXTMATCH 0
-+#endif
- static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
-                 const CHAR *string_end, bool no_leading_period, int flags)
-      internal_function;