diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index c052f9c5e389..1ce9fcdfc2bc 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	nats-streaming-server
-PORTVERSION=	0.24.5
+PORTVERSION=	0.24.6
 DISTVERSIONPREFIX=	v
 PORTREVISION=	0
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Streaming system server for NATS
 
 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 \
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:crypto:3147a52a75dd:golang_crypto/vendor/golang.org/x/crypto \
 		golang:sys:33da011f77ad:golang_sys/vendor/golang.org/x/sys \
 		golang:time:f0f3c7e86c11: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.7:hashicorp_raft/vendor/github.com/hashicorp/raft \
+		hashicorp:raft:v1.3.9:hashicorp_raft/vendor/github.com/hashicorp/raft \
 		klauspost:compress:v1.14.4: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:442af02fd36a:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
-		nats-io:nats-server:v2.8.1:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
-		nats-io:nats.go:v1.14.0:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
+		nats-io:nats-server:v2.8.2:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
+		nats-io:nats.go:v1.15.0: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.2:nats_io_stan_go/vendor/github.com/nats-io/stan.go \
 		prometheus:procfs:v0.7.3: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 619a4c087a98..ac767333c089 100644
--- a/net/nats-streaming-server/distinfo
+++ b/net/nats-streaming-server/distinfo
@@ -1,53 +1,53 @@
-TIMESTAMP = 1650650350
-SHA256 (nats-io-nats-streaming-server-v0.24.5_GH0.tar.gz) = f648018ca85e4d2e9e53b2c632ff5435825e18ea1306e80c0fb0f59fadf999ae
-SIZE (nats-io-nats-streaming-server-v0.24.5_GH0.tar.gz) = 414255
+TIMESTAMP = 1651786026
+SHA256 (nats-io-nats-streaming-server-v0.24.6_GH0.tar.gz) = 750e091f3473688a1b0c251513bf9beb7a12e3e1359d541b53381bd91e09b9be
+SIZE (nats-io-nats-streaming-server-v0.24.6_GH0.tar.gz) = 414264
 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 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
 SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725
 SHA256 (golang-crypto-3147a52a75dd_GH0.tar.gz) = 25542a72981bc3c33fca702a21feae4d6242298255354cfa2359d6195ff8656a
 SIZE (golang-crypto-3147a52a75dd_GH0.tar.gz) = 1630551
 SHA256 (golang-sys-33da011f77ad_GH0.tar.gz) = 2c6c52ba83b2aa4a8c8bb5b30aff44a9f0708c56d799b38fa06cc5174af5f8a1
 SIZE (golang-sys-33da011f77ad_GH0.tar.gz) = 1292804
 SHA256 (golang-time-f0f3c7e86c11_GH0.tar.gz) = 421890dd6e4b7e8d5ca68cc163c8b3b08436898664534aedfefd8602e11a4e53
 SIZE (golang-time-f0f3c7e86c11_GH0.tar.gz) = 9626
 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.7_GH0.tar.gz) = 0f3b2f37ae031cf0bde0fdbf70ccf1dc153d29027a500440ebc04e28549faf2b
-SIZE (hashicorp-raft-v1.3.7_GH0.tar.gz) = 147348
+SHA256 (hashicorp-raft-v1.3.9_GH0.tar.gz) = 5938bbf3504599c83df5f1e394409bd5cf58a2981a6240315951725eec6e9605
+SIZE (hashicorp-raft-v1.3.9_GH0.tar.gz) = 149459
 SHA256 (klauspost-compress-v1.14.4_GH0.tar.gz) = 30480619257f7d40fcbfd61b59c34fd36e85220ac2eee400c493b06c37f53740
 SIZE (klauspost-compress-v1.14.4_GH0.tar.gz) = 15502117
 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-442af02fd36a_GH0.tar.gz) = 06093c35694c7408c5f429f84026968b1cf69290f883a14be7e10a49ebfcee6b
 SIZE (nats-io-jwt-442af02fd36a_GH0.tar.gz) = 82961
-SHA256 (nats-io-nats-server-v2.8.1_GH0.tar.gz) = 510c766aee83742190c0ff63dccd58eb27282b6aa292f0e6752fbeafda1d0ecb
-SIZE (nats-io-nats-server-v2.8.1_GH0.tar.gz) = 1461120
-SHA256 (nats-io-nats.go-v1.14.0_GH0.tar.gz) = 0783447182864e6da5e83ca0f292ae96402aa3accf12bf7bd399deacea8212df
-SIZE (nats-io-nats.go-v1.14.0_GH0.tar.gz) = 255339
+SHA256 (nats-io-nats-server-v2.8.2_GH0.tar.gz) = aebddf3f65249dfa94521270ce599eb0af2855c5f57cfb5576f8ac0caf74822e
+SIZE (nats-io-nats-server-v2.8.2_GH0.tar.gz) = 1467277
+SHA256 (nats-io-nats.go-v1.15.0_GH0.tar.gz) = 3ec8ae3226279d560d080cc122d629d4bde87408eb0c45fafec2e5404f218326
+SIZE (nats-io-nats.go-v1.15.0_GH0.tar.gz) = 257241
 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.2_GH0.tar.gz) = 6cecdf542cc14778814060a2b69423a0d10e13e0090621550d3ff56e4851a37f
 SIZE (nats-io-stan.go-v0.10.2_GH0.tar.gz) = 63335
 SHA256 (prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b
 SIZE (prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957