diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index fca054f1e533..089482a0e8d6 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	nats-streaming-server
-PORTVERSION=	0.25.2
+PORTVERSION=	0.25.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Streaming system server for NATS
 WWW=		https://nats.io/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 GH_TUPLE=	armon:go-metrics:ec5e00d3c878:armon_go_metrics/vendor/github.com/armon/go-metrics \
 		etcd-io:bbolt:v1.3.6:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
 		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
-		go-sql-driver:mysql:v1.6.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
+		go-sql-driver:mysql:v1.7.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:crypto:d6f0a8c073c2:golang_crypto/vendor/golang.org/x/crypto \
-		golang:sys:090e33056c14:golang_sys/vendor/golang.org/x/sys \
+		golang:crypto:v0.5.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:b8be2fde2a9e:golang_sys/vendor/golang.org/x/sys \
 		golang:time:f3bd1da661af:golang_time/vendor/golang.org/x/time \
 		hashicorp:go-hclog:v1.1.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
 		hashicorp:go-immutable-radix:v1.0.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
 		hashicorp:go-msgpack:v1.1.5:hashicorp_go_msgpack/vendor/github.com/hashicorp/go-msgpack \
 		hashicorp:golang-lru:v0.5.0:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		hashicorp:raft:v1.3.11:hashicorp_raft/vendor/github.com/hashicorp/raft \
 		klauspost:compress:v1.15.11:klauspost_compress/vendor/github.com/klauspost/compress \
 		lib:pq:v1.10.4:lib_pq/vendor/github.com/lib/pq \
 		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.10:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		minio:highwayhash:v1.0.2:minio_highwayhash/vendor/github.com/minio/highwayhash \
 		nats-io:jwt:v2.3.0:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
-		nats-io:nats-server:v2.9.3:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
-		nats-io:nats.go:v1.17.0:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
+		nats-io:nats-server:v2.9.11:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
+		nats-io:nats.go:v1.22.1:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
 		nats-io:nkeys:v0.3.0:nats_io_nkeys/vendor/github.com/nats-io/nkeys \
 		nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \
-		nats-io:stan.go:v0.10.3:nats_io_stan_go/vendor/github.com/nats-io/stan.go \
+		nats-io:stan.go:v0.10.4:nats_io_stan_go/vendor/github.com/nats-io/stan.go \
 		prometheus:procfs:v0.8.0:prometheus_procfs/vendor/github.com/prometheus/procfs
 
 USE_RC_SUBR=	nats_streaming.sh
 GO_BUILDFLAGS=	-buildvcs=false
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/nats_streaming.conf ${STAGEDIR}${PREFIX}/etc/nats_streaming.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/nats-streaming-server/distinfo b/net/nats-streaming-server/distinfo
index f6d592a55457..a4f2827ba32e 100644
--- a/net/nats-streaming-server/distinfo
+++ b/net/nats-streaming-server/distinfo
@@ -1,53 +1,53 @@
-TIMESTAMP = 1665594933
-SHA256 (nats-io-nats-streaming-server-v0.25.2_GH0.tar.gz) = f0a8baa9770d305c11b425a57383c8c0fcfa59836e30010aec19c14e54436b54
-SIZE (nats-io-nats-streaming-server-v0.25.2_GH0.tar.gz) = 424134
+TIMESTAMP = 1676570420
+SHA256 (nats-io-nats-streaming-server-v0.25.3_GH0.tar.gz) = 3fd42f75ecf65aa8d5faebcaa45c5fe4a2a1a1d24c8f7d1f5919434f1ccbc3b1
+SIZE (nats-io-nats-streaming-server-v0.25.3_GH0.tar.gz) = 424390
 SHA256 (armon-go-metrics-ec5e00d3c878_GH0.tar.gz) = de6df8b15d119c393073fb1ddc53c4859d58d7163caddffe2a78b90034fb5876
 SIZE (armon-go-metrics-ec5e00d3c878_GH0.tar.gz) = 27431
 SHA256 (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = a2e524f7f32c44fa0765de192ac0789c585010cadd2c2ddcf9518e858a96ec1f
 SIZE (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = 98025
 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
-SHA256 (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 25233aea6418ca7e2e8d83f1bf4f498ef7f79c8c0fee1dc2a8ba623372574b28
-SIZE (go-sql-driver-mysql-v1.6.0_GH0.tar.gz) = 94168
+SHA256 (go-sql-driver-mysql-v1.7.0_GH0.tar.gz) = f10b14cbfee86091c11676d962a390d74f8edee74904c5d2c49e7ca0b27986e3
+SIZE (go-sql-driver-mysql-v1.7.0_GH0.tar.gz) = 95625
 SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
 SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725
-SHA256 (golang-crypto-d6f0a8c073c2_GH0.tar.gz) = 683cd3dace5416c4b0fc7ec3167e920340d8a369181cca83337b3df54ee98665
-SIZE (golang-crypto-d6f0a8c073c2_GH0.tar.gz) = 1631992
-SHA256 (golang-sys-090e33056c14_GH0.tar.gz) = e849c57a00b3c7b981d8da5089cad820047dc5f2cb33e6a4897d1960244da875
-SIZE (golang-sys-090e33056c14_GH0.tar.gz) = 1408889
+SHA256 (golang-crypto-v0.5.0_GH0.tar.gz) = 8bcfaa35f98b42734c36989ab8f98b51343468ddcd386f4583a585c1f23b33dd
+SIZE (golang-crypto-v0.5.0_GH0.tar.gz) = 1633607
+SHA256 (golang-sys-b8be2fde2a9e_GH0.tar.gz) = f0d8b0814bc57c47fafd0b070c447985e331e981ca6c8437985ef9b9d9e6e157
+SIZE (golang-sys-b8be2fde2a9e_GH0.tar.gz) = 1425657
 SHA256 (golang-time-f3bd1da661af_GH0.tar.gz) = 9f2237ba44dadb7186cfcf84f01758e0cf89cff12bc063f3d15feef7197282d7
 SIZE (golang-time-f3bd1da661af_GH0.tar.gz) = 11111
 SHA256 (hashicorp-go-hclog-v1.1.0_GH0.tar.gz) = 842685ea514472da7a13d5be64e5b860b22f1eba987eaf5d5dbafda953e45418
 SIZE (hashicorp-go-hclog-v1.1.0_GH0.tar.gz) = 28790
 SHA256 (hashicorp-go-immutable-radix-v1.0.0_GH0.tar.gz) = 503eda1702edbe9eb36b162b8ca0da02eac2acfb73140077aa73fb817c3fca47
 SIZE (hashicorp-go-immutable-radix-v1.0.0_GH0.tar.gz) = 19305
 SHA256 (hashicorp-go-msgpack-v1.1.5_GH0.tar.gz) = d566f7c3ee2a5da0a69ff0ba91878e6f7c5742f2a2b572defa0e97c8e0144cc5
 SIZE (hashicorp-go-msgpack-v1.1.5_GH0.tar.gz) = 371295
 SHA256 (hashicorp-golang-lru-v0.5.0_GH0.tar.gz) = be137eb6d52bf3573c13d3c6713b7463e82d7d18efefe3959af4d96bc9ed3357
 SIZE (hashicorp-golang-lru-v0.5.0_GH0.tar.gz) = 12942
 SHA256 (hashicorp-raft-v1.3.11_GH0.tar.gz) = f3d98dad1a64bc962348da0f5ffce349f2a701d5c1c06ed3dc8ccc1b7a1ad8c2
 SIZE (hashicorp-raft-v1.3.11_GH0.tar.gz) = 152059
 SHA256 (klauspost-compress-v1.15.11_GH0.tar.gz) = e79cfb490113c6983c5ba962f2e61bde4572f1cdcc02bbf9573f479c7eee5773
 SIZE (klauspost-compress-v1.15.11_GH0.tar.gz) = 36199166
 SHA256 (lib-pq-v1.10.4_GH0.tar.gz) = 3d56bb8c6b50d86b6d053053a7da831a07e9da39205ffa23dfbf1487234ab742
 SIZE (lib-pq-v1.10.4_GH0.tar.gz) = 108132
 SHA256 (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 157806ad8125e6bef4d9b58c9125ccb98a8343136f93faf442ab0cc6e7c24c11
 SIZE (mattn-go-colorable-v0.1.4_GH0.tar.gz) = 8981
 SHA256 (mattn-go-isatty-v0.0.10_GH0.tar.gz) = 55408e1afd78eaa112842ae2263e70703d5b5133feaa17fa477980a87a961fe7
 SIZE (mattn-go-isatty-v0.0.10_GH0.tar.gz) = 4465
 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.3.0_GH0.tar.gz) = 3f6d78974c16b44d8dcc5a6e8daa1d38238a69674ae01bfda27123b31a0dc4de
 SIZE (nats-io-jwt-v2.3.0_GH0.tar.gz) = 82968
-SHA256 (nats-io-nats-server-v2.9.3_GH0.tar.gz) = fe53f42a724fef1aac1ab09e3187dcc82fd3761b07960a04a168af767b9b955a
-SIZE (nats-io-nats-server-v2.9.3_GH0.tar.gz) = 1593692
-SHA256 (nats-io-nats.go-v1.17.0_GH0.tar.gz) = 238c7f9311566ce655960325c30ca2bfac6d78e50afaba3a09431e78806c5783
-SIZE (nats-io-nats.go-v1.17.0_GH0.tar.gz) = 376338
+SHA256 (nats-io-nats-server-v2.9.11_GH0.tar.gz) = cd5afb9867042ebc62d2eec383ddf7332abf409f462776ec1432c94ec59fdf57
+SIZE (nats-io-nats-server-v2.9.11_GH0.tar.gz) = 1639748
+SHA256 (nats-io-nats.go-v1.22.1_GH0.tar.gz) = 606b526d99a1035d868f82ea72ae43dd67eae1544bedba51a76d894f4d96e9c8
+SIZE (nats-io-nats.go-v1.22.1_GH0.tar.gz) = 393564
 SHA256 (nats-io-nkeys-v0.3.0_GH0.tar.gz) = ea281df5dc380b84f61c3712b367f02957cff4cb7802e73b2b0b7588e4f6b809
 SIZE (nats-io-nkeys-v0.3.0_GH0.tar.gz) = 19986
 SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d
 SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529
-SHA256 (nats-io-stan.go-v0.10.3_GH0.tar.gz) = e4488b43adcc687b394a58478db5ba5be9db27283546ac76b1f876deb55759d7
-SIZE (nats-io-stan.go-v0.10.3_GH0.tar.gz) = 63458
+SHA256 (nats-io-stan.go-v0.10.4_GH0.tar.gz) = cc432ec80ab7d933ac1fc47f02da29e3ae7eb240c83b1d7251931475e5c2212c
+SIZE (nats-io-stan.go-v0.10.4_GH0.tar.gz) = 64592
 SHA256 (prometheus-procfs-v0.8.0_GH0.tar.gz) = bb99fc8ee03c40374bd2f78b7907f1353bd57bd34fd080a9664d99983f24aeed
 SIZE (prometheus-procfs-v0.8.0_GH0.tar.gz) = 194809