diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 060fc7431c9..738a5b7d4dc 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -366,7 +366,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`x265`](x265/)                                 | x265                                                          | 4.3                    | https://bitbucket.org/multicoreware/x265_git/wiki/Home               |
 | [`xash3d-fwgs`](xash3d-fwgs/)                   | Xash3D FWGS game engine                                       | 2022.12.26             | https://github.com/FWGS/xash3d-fwgs                                  |
 | [`xmp-cli`](xmp-cli/)                           | Extended Module Player                                        | 4.2.0                  | https://github.com/libxmp/xmp-cli                                    |
-| [`xorriso`](xorriso/)                           | xorriso                                                       | 1.5.6                  | https://www.gnu.org/software/xorriso                                 |
+| [`xorriso`](xorriso/)                           | xorriso                                                       | 1.5.8.pl02             | https://www.gnu.org/software/xorriso                                 |
 | [`xz`](xz/)                                     | xz                                                            | 5.8.4                  | https://tukaani.org/xz/                                              |
 | [`yasm`](yasm/)                                 | Yasm Modular Assembler                                        | 1.3.0                  | https://yasm.tortall.net/                                            |
 | [`zig`](zig/)                                   | Zig programming language                                      | 0.17.0                 | https://ziglang.org/                                                 |
diff --git a/Ports/xorriso/package.sh b/Ports/xorriso/package.sh
index fd9e1bd9972..71220787030 100755
--- a/Ports/xorriso/package.sh
+++ b/Ports/xorriso/package.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port='xorriso'
-version='1.5.6'
+version='1.5.8.pl02'
+workdir='xorriso-1.5.8'
 files=(
-    "https://www.gnu.org/software/xorriso/xorriso-${version}.tar.gz#d4b6b66bd04c49c6b358ee66475d806d6f6d7486e801106a47d331df1f2f8feb"
+    "https://www.gnu.org/software/xorriso/xorriso-${version}.tar.gz#b1455ecafbf0692ddafe1d71002a96f2ce2d77f4deae602678261ce033f97bc8"
 )
 depends=(
     'libiconv'
 )
 useconfigure='true'
-use_fresh_config_sub='true'
diff --git a/Ports/xorriso/patches/0001-parse_exec-replace-wait3-with-waitpid.patch b/Ports/xorriso/patches/0001-parse_exec-replace-wait3-with-waitpid.patch
deleted file mode 100644
index 0091af00df0..00000000000
--- a/Ports/xorriso/patches/0001-parse_exec-replace-wait3-with-waitpid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Beckett Normington <beckett@b0ba.dev>
-Date: Thu, 10 Aug 2023 09:48:21 -0400
-Subject: [PATCH] parse_exec: replace wait3() with waitpid()
-
----
- xorriso/parse_exec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c
-index e94abcbac719e82a617f4135a77686632d04866b..52fb60dc516ed30f2debd921e4e52145b63cfb54 100644
---- a/xorriso/parse_exec.c
-+++ b/xorriso/parse_exec.c
-@@ -2988,7 +2988,7 @@ int Xorriso_execv(struct XorrisO *xorriso, char *cmd,
- 
-  Xorriso_alloc_meM(prog, char, 5 * SfileadrL);
- 
-- wait3(NULL,WNOHANG,NULL); /* just to remove any old dead child */
-+ waitpid(-1,NULL,WNOHANG); /* just to remove any old dead child */
- 
-  if(flag & 2) {
-    ret= Xorriso_make_argv_with_null(xorriso, in_argc, in_argv,
diff --git a/Ports/xorriso/patches/ReadMe.md b/Ports/xorriso/patches/ReadMe.md
deleted file mode 100644
index 4e8d236e0d9..00000000000
--- a/Ports/xorriso/patches/ReadMe.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Patches for xorriso on SerenityOS
-
-## `0001-parse_exec-replace-wait3-with-waitpid.patch`
-
-parse_exec: replace wait3() with waitpid()
-
-