diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 27c6eae5b50..39736698e7e 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -85,7 +85,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
 | [`libpng`](libpng/)                    | libpng                                                          | 1.6.37                   | https://libpng.org/                                                            |
 | [`libpuffy`](libpuffy/)                | libpuffy                                                        | 1.0                      | https://github.com/ibara/libpuffy                                              |
 | [`libsixel`](libsixel/)                | libsixel                                                        | 1.8.6                    | https://github.com/saitoha/libsixel                                            |
-| [`libsodium`](libsodium/)              | libsodium                                                       | 1.0.18-stable            | https://doc.libsodium.org/                                                     |
+| [`libsodium`](libsodium/)              | libsodium                                                       | 1.0.18                   | https://doc.libsodium.org/                                                     |
 | [`libtheora`](libtheora/)              | libtheora                                                       | 1.1.1                    | https://www.theora.org/                                                        |
 | [`libtiff`](libtiff/)                  | libtiff                                                         | 4.2.0                    | http://www.libtiff.org/                                                        |
 | [`libtool`](libtool/)                  | libtool                                                         | 2.4                      | https://www.gnu.org/software/libtool/                                          |
diff --git a/Ports/libsodium/package.sh b/Ports/libsodium/package.sh
index a3a2abb0e0a..1b4c0f7712a 100755
--- a/Ports/libsodium/package.sh
+++ b/Ports/libsodium/package.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=libsodium
-version=1.0.18-stable
+version=1.0.18
 useconfigure=true
-workdir=libsodium-stable
-files="https://download.libsodium.org/libsodium/releases/libsodium-${version}.tar.gz libsodium-${version}.tar.gz 3c240fcd414189492d7c7dc12d2cf48f67bf04142ce2f60b620adb5bac6ca732"
+workdir=libsodium-${version}
+files="https://download.libsodium.org/libsodium/releases/libsodium-${version}.tar.gz libsodium-${version}.tar.gz 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1"
 auth_type=sha256
 
 install() {
diff --git a/Ports/libsodium/patches/fix-config-sub.patch b/Ports/libsodium/patches/fix-config-sub.patch
new file mode 100644
index 00000000000..41f6d11323d
--- /dev/null
+++ b/Ports/libsodium/patches/fix-config-sub.patch
@@ -0,0 +1,12 @@
+diff -ur a/build-aux/config.sub b/build-aux/config.sub
+--- a/build-aux/config.sub	2019-05-30 22:20:06.000000000 +0200
++++ b/build-aux/config.sub	2021-11-01 10:53:11.568353185 +0100
+@@ -1341,7 +1341,7 @@
+ 	# The portable systems comes first.
+ 	# Each alternative MUST end in a * to match a version number.
+ 	# sysv* is not here because it comes later, after sysvr4.
+-	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
++	gnu* | bsd* | mach* | minix* | genix* | ultrix* | serenity* | irix* \
+ 	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+ 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ 	     | sym* | kopensolaris* | plan9* \