diff --git a/security/libsodium/Makefile b/security/libsodium/Makefile
index bcb83b77efa5..1b778e9eeda6 100644
--- a/security/libsodium/Makefile
+++ b/security/libsodium/Makefile
@@ -1,31 +1,37 @@
 PORTNAME=	libsodium
 #################################################
 # Make sure to bump all consumers when updating #
 #################################################
-PORTVERSION=	1.0.21
+DISTVERSION=	1.0.22
 CATEGORIES=	security
-MASTER_SITES=	https://download.libsodium.org/libsodium/releases/
+MASTER_SITES=	https://github.com/jedisct1/${PORTNAME}/releases/download/${DISTVERSION}-RELEASE/ \
+		https://download.libsodium.org/${PORTNAME}/releases/
 
 MAINTAINER=	vsevolod@FreeBSD.org
 COMMENT=	Library to build higher-level cryptographic tools
 WWW=		https://github.com/jedisct1/libsodium/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		libtool pathfix pkgconfig
+USES=		libtool pathfix pkgconfig tar:bz2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
+
+OPTIMIZED_CFLAGS_CFLAGS+=	-ftree-vectorize \
+				-ftree-slp-vectorize \
+				-fomit-frame-pointer
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/THANKS ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/security/libsodium/distinfo b/security/libsodium/distinfo
index 949c8cdcbdd1..df41d99bff31 100644
--- a/security/libsodium/distinfo
+++ b/security/libsodium/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1767780602
-SHA256 (libsodium-1.0.21.tar.gz) = 9e4285c7a419e82dedb0be63a72eea357d6943bc3e28e6735bf600dd4883feaf
-SIZE (libsodium-1.0.21.tar.gz) = 2046164
+TIMESTAMP = 1775900160
+SHA256 (libsodium-1.0.22.tar.bz2) = 51b93737bf62e8549b0e94dce0fba92169e31c8ecc160883460a9bdaa6d2c298
+SIZE (libsodium-1.0.22.tar.bz2) = 1653271
diff --git a/security/libsodium/pkg-plist b/security/libsodium/pkg-plist
index ecde1e156228..dd47f92ffa3e 100644
--- a/security/libsodium/pkg-plist
+++ b/security/libsodium/pkg-plist
@@ -1,81 +1,85 @@
 include/sodium.h
 include/sodium/core.h
 include/sodium/crypto_aead_aegis128l.h
 include/sodium/crypto_aead_aegis256.h
 include/sodium/crypto_aead_aes256gcm.h
 include/sodium/crypto_aead_chacha20poly1305.h
 include/sodium/crypto_aead_xchacha20poly1305.h
 include/sodium/crypto_auth.h
 include/sodium/crypto_auth_hmacsha256.h
 include/sodium/crypto_auth_hmacsha512.h
 include/sodium/crypto_auth_hmacsha512256.h
 include/sodium/crypto_box.h
 include/sodium/crypto_box_curve25519xchacha20poly1305.h
 include/sodium/crypto_box_curve25519xsalsa20poly1305.h
 include/sodium/crypto_core_ed25519.h
 include/sodium/crypto_core_hchacha20.h
 include/sodium/crypto_core_hsalsa20.h
 include/sodium/crypto_core_keccak1600.h
 include/sodium/crypto_core_ristretto255.h
 include/sodium/crypto_core_salsa20.h
 include/sodium/crypto_core_salsa2012.h
 include/sodium/crypto_core_salsa208.h
 include/sodium/crypto_generichash.h
 include/sodium/crypto_generichash_blake2b.h
 include/sodium/crypto_hash.h
 include/sodium/crypto_hash_sha256.h
+include/sodium/crypto_hash_sha3.h
 include/sodium/crypto_hash_sha512.h
 include/sodium/crypto_ipcrypt.h
 include/sodium/crypto_kdf.h
 include/sodium/crypto_kdf_blake2b.h
 include/sodium/crypto_kdf_hkdf_sha256.h
 include/sodium/crypto_kdf_hkdf_sha512.h
+include/sodium/crypto_kem.h
+include/sodium/crypto_kem_mlkem768.h
+include/sodium/crypto_kem_xwing.h
 include/sodium/crypto_kx.h
 include/sodium/crypto_onetimeauth.h
 include/sodium/crypto_onetimeauth_poly1305.h
 include/sodium/crypto_pwhash.h
 include/sodium/crypto_pwhash_argon2i.h
 include/sodium/crypto_pwhash_argon2id.h
 include/sodium/crypto_pwhash_scryptsalsa208sha256.h
 include/sodium/crypto_scalarmult.h
 include/sodium/crypto_scalarmult_curve25519.h
 include/sodium/crypto_scalarmult_ed25519.h
 include/sodium/crypto_scalarmult_ristretto255.h
 include/sodium/crypto_secretbox.h
 include/sodium/crypto_secretbox_xchacha20poly1305.h
 include/sodium/crypto_secretbox_xsalsa20poly1305.h
 include/sodium/crypto_secretstream_xchacha20poly1305.h
 include/sodium/crypto_shorthash.h
 include/sodium/crypto_shorthash_siphash24.h
 include/sodium/crypto_sign.h
 include/sodium/crypto_sign_ed25519.h
 include/sodium/crypto_sign_edwards25519sha512batch.h
 include/sodium/crypto_stream.h
 include/sodium/crypto_stream_chacha20.h
 include/sodium/crypto_stream_salsa20.h
 include/sodium/crypto_stream_salsa2012.h
 include/sodium/crypto_stream_salsa208.h
 include/sodium/crypto_stream_xchacha20.h
 include/sodium/crypto_stream_xsalsa20.h
 include/sodium/crypto_verify_16.h
 include/sodium/crypto_verify_32.h
 include/sodium/crypto_verify_64.h
 include/sodium/crypto_xof_shake128.h
 include/sodium/crypto_xof_shake256.h
 include/sodium/crypto_xof_turboshake128.h
 include/sodium/crypto_xof_turboshake256.h
 include/sodium/export.h
 include/sodium/randombytes.h
 include/sodium/randombytes_internal_random.h
 include/sodium/randombytes_sysrandom.h
 include/sodium/runtime.h
 include/sodium/utils.h
 include/sodium/version.h
 lib/libsodium.a
 lib/libsodium.so
 lib/libsodium.so.26
-lib/libsodium.so.26.3.0
+lib/libsodium.so.26.4.0
 libdata/pkgconfig/libsodium.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README.markdown
 %%PORTDOCS%%%%DOCSDIR%%/THANKS