diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 67f75c9c4d56af..96e518d10622d4 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -62,7 +62,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/                                 |
 | [`mrsh`](mrsh/)                | mrsh                                          | d9763a3           | https://mrsh.sh/                                      |
 | [`nano`](nano/)                | GNU nano                                      | 4.5               | https://www.nano-editor.org/                          |
-| [`nasm`](nasm/)                | Netwide Assembler (NASM)                      | 2.14.02           | https://www.nasm.us/                                  |
+| [`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                |
 | [`nesalizer`](nesalizer/)      | Nesalizer                                     |                   | https://github.com/SerenityOS/nesalizer               |
diff --git a/Ports/nasm/package.sh b/Ports/nasm/package.sh
index 6d01c5ae1e5691..f7ee20fac3b3fd 100755
--- a/Ports/nasm/package.sh
+++ b/Ports/nasm/package.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=nasm
-version=2.14.02
+version=2.15.05
 files="https://www.nasm.us/pub/nasm/releasebuilds/${version}/nasm-${version}.tar.gz nasm-${version}.tar.gz"
 useconfigure=true
 makeopts=
diff --git a/Ports/nasm/patches/config.sub.patch b/Ports/nasm/patches/config.sub.patch
new file mode 100644
index 00000000000000..f172d9eef388c5
--- /dev/null
+++ b/Ports/nasm/patches/config.sub.patch
@@ -0,0 +1,20 @@
+--- nasm-2.15.05/autoconf/helpers/original-config.sub	2021-04-13 19:00:40.329393345 +0100
++++ nasm-2.15.05/autoconf/helpers/config.sub	2021-04-13 19:02:01.489645184 +0100
+@@ -134,7 +134,7 @@
+ 			nto-qnx* | linux-* | uclinux-uclibc* \
+ 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+-			| storm-chaos* | os2-emx* | rtmk-nova*)
++			| storm-chaos* | os2-emx* | rtmk-nova* | serenity)
+ 				basic_machine=$field1
+ 				basic_os=$maybe_os
+ 				;;
+@@ -1720,7 +1720,7 @@
+ 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*)
++	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | serenity*)
+ 		;;
+ 	# This one is extra strict with allowed versions
+ 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)