diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile
index 4ebf2f067cae..23fa08bf5a88 100644
--- a/net/nats-server/Makefile
+++ b/net/nats-server/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	nats-server
-PORTVERSION=	2.9.21
+PORTVERSION=	2.9.22
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Messaging system written in Go
 WWW=		https://nats.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
-GH_TUPLE=	golang:crypto:v0.11.0:golang_crypto/vendor/golang.org/x/crypto \
+GH_TUPLE=	golang:crypto:v0.12.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:v0.10.0:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:v0.11.0:golang_sys/vendor/golang.org/x/sys \
 		golang:time:v0.3.0:golang_time/vendor/golang.org/x/time \
 		klauspost:compress:v1.16.7:klauspost_compress/vendor/github.com/klauspost/compress \
 		minio:highwayhash:v1.0.2:minio_highwayhash/vendor/github.com/minio/highwayhash \
-		nats-io:jwt:v2.4.1:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
+		nats-io:jwt:v2.5.0:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
 		nats-io:nats.go:v1.28.0:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
 		nats-io:nkeys:v0.4.4:nats_io_nkeys/vendor/github.com/nats-io/nkeys \
 		nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \
 		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		uber-go:automaxprocs:v1.5.3:uber_go_automaxprocs/vendor/go.uber.org/automaxprocs
 
 USE_RC_SUBR=	nats.sh
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 USERS=		nats
 GROUPS=		nats
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${LN} -s ${WRKSRC} ${WRKSRC}/vendor/${GO_PKGNAME}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${FILESDIR}/nats.conf ${STAGEDIR}${PREFIX}/etc/nats.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/server && ${COPYTREE_SHARE} configs ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/nats-server/distinfo b/net/nats-server/distinfo
index 6c616720a7e2..fac91c5479ea 100644
--- a/net/nats-server/distinfo
+++ b/net/nats-server/distinfo
@@ -1,27 +1,27 @@
-TIMESTAMP = 1691318589
-SHA256 (nats-io-nats-server-v2.9.21_GH0.tar.gz) = e547ef512b59bd124e6851ee288584f6fd08cee3654f8c4a570abe11bc8d70a1
-SIZE (nats-io-nats-server-v2.9.21_GH0.tar.gz) = 1829926
-SHA256 (golang-crypto-v0.11.0_GH0.tar.gz) = 6fb82982c2c8217f0018fd10751b2695998321a82e18750d43bbbec69fc99f3b
-SIZE (golang-crypto-v0.11.0_GH0.tar.gz) = 1788988
+TIMESTAMP = 1694076096
+SHA256 (nats-io-nats-server-v2.9.22_GH0.tar.gz) = 55e362ddb4dc121a09fdee9b45beb5552daca3cedc1551899d209d7505f0b2c6
+SIZE (nats-io-nats-server-v2.9.22_GH0.tar.gz) = 1851531
+SHA256 (golang-crypto-v0.12.0_GH0.tar.gz) = f2e422baedd3a599471bfe6adb8e4b337a80bb8a9665d283a8d0810edadbd31c
+SIZE (golang-crypto-v0.12.0_GH0.tar.gz) = 1792261
 SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
 SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
-SHA256 (golang-sys-v0.10.0_GH0.tar.gz) = d8ab2cec3d87e5a0e9ecaab8a3aff10d58f0048c7308577eeab19f09411a3bf6
-SIZE (golang-sys-v0.10.0_GH0.tar.gz) = 1441416
+SHA256 (golang-sys-v0.11.0_GH0.tar.gz) = 907778fbdf5a900ee51fc45e0a3f2cc7bc693af8a9c972c00679b194b61ea24c
+SIZE (golang-sys-v0.11.0_GH0.tar.gz) = 1445078
 SHA256 (golang-time-v0.3.0_GH0.tar.gz) = 2419ace580d977566862f0145991cd63f5db634518ea73f30d7a705a176e86eb
 SIZE (golang-time-v0.3.0_GH0.tar.gz) = 12214
 SHA256 (klauspost-compress-v1.16.7_GH0.tar.gz) = 0f68d194c726a9cc36bcd011e2f4498d15dad5f040382c3dbfffd7bf7d2bca28
 SIZE (klauspost-compress-v1.16.7_GH0.tar.gz) = 37939325
 SHA256 (minio-highwayhash-v1.0.2_GH0.tar.gz) = 5a89e6f3e77cb77c818c5ce0316812d544e588456fce2e55e02f48d52fa9c5d2
 SIZE (minio-highwayhash-v1.0.2_GH0.tar.gz) = 23056
-SHA256 (nats-io-jwt-v2.4.1_GH0.tar.gz) = 4aa61ae17e5329aaf5dc4466c71080f43ab5c0ee16179840c117f741e8cac5f5
-SIZE (nats-io-jwt-v2.4.1_GH0.tar.gz) = 85279
+SHA256 (nats-io-jwt-v2.5.0_GH0.tar.gz) = 64015e7428fef3b5b8b06cb8b8968afcb61d9426005a170b956064eddf49a02e
+SIZE (nats-io-jwt-v2.5.0_GH0.tar.gz) = 87858
 SHA256 (nats-io-nats.go-v1.28.0_GH0.tar.gz) = 5ae71b6d8af3e52276b22e699921717b6e0204142f2ab0f743ca71b5d858b7b2
 SIZE (nats-io-nats.go-v1.28.0_GH0.tar.gz) = 469639
 SHA256 (nats-io-nkeys-v0.4.4_GH0.tar.gz) = fd57700c3f1a9d77a38cd9d41edad8be8f89a7dc57eca22ae2c0dfaca85bd53b
 SIZE (nats-io-nkeys-v0.4.4_GH0.tar.gz) = 24153
 SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d
 SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529
 SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
 SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648
 SHA256 (uber-go-automaxprocs-v1.5.3_GH0.tar.gz) = 55f6be4ce942848e73ca0cd46dd13eb8e719634562e41885b919cb19f7d0d6e1
 SIZE (uber-go-automaxprocs-v1.5.3_GH0.tar.gz) = 24027
diff --git a/net/nats-server/pkg-plist b/net/nats-server/pkg-plist
index abde9be02d92..a47978063669 100644
--- a/net/nats-server/pkg-plist
+++ b/net/nats-server/pkg-plist
@@ -1,69 +1,84 @@
 bin/nats-server
 @sample etc/nats.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/configs/accounts.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/authorization.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/cert.new.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/key.new.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/key.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/certs/server.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-ca-cert.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-ca-key.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-cert-ed25519.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-cert-rsa-1024.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-cert-rsa-2048.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-cert-rsa-4096.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-key-ed25519.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-key-rsa-1024.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-key-rsa-2048.pem
+%%PORTDOCS%%%%DOCSDIR%%/configs/certs/tls/benchmark-server-key-rsa-4096.pem
 %%PORTDOCS%%%%DOCSDIR%%/configs/cluster.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/gwa.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/gwb.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/gws.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/include_bad_conf_check_a.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/include_bad_conf_check_b.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/include_conf_check_a.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/include_conf_check_b.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/include_conf_check_c.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/js-op.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen-1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen_port.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/listen_port_with_colon.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/malformed_cluster_address.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/malformed_listen_address.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/multiple_errors.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/multiple_users.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/new_style_authorization.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/one.creds
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/authorization_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/authorization_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/basic.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/file_rotate.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/file_rotate1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/invalid.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/max_connections.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/max_payload.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/multiple_users_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/multiple_users_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/reload.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/reload_unsupported.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/single_user_authentication_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/single_user_authentication_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_3.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_a_4.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_b_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_b_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/srv_c_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/tls_test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/tls_verify_test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/token_authentication_1.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/reload/token_authentication_2.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/seed.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/seed_tls.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_a.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_a_bcrypt.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_b.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/srv_b_bcrypt.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/test.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/tls/tls-ed25519.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/tls/tls-none.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/tls/tls-rsa-1024.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/tls/tls-rsa-2048.conf
+%%PORTDOCS%%%%DOCSDIR%%/configs/tls/tls-rsa-4096.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_bad_cipher.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_bad_curve_prefs.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_ciphers.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_curve_prefs.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_empty_cipher.conf
 %%PORTDOCS%%%%DOCSDIR%%/configs/tls_empty_curve_prefs.conf