diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile
index fd93d0720046..76295ff9c2b0 100644
--- a/net/nats-server/Makefile
+++ b/net/nats-server/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	nats-server
-PORTVERSION=	2.8.3
+PORTVERSION=	2.8.4
 DISTVERSIONPREFIX=	v
 PORTREVISION=	0
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Messaging system written in Go
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 GH_TUPLE=	golang:crypto:3147a52a75dd:golang_crypto/vendor/golang.org/x/crypto \
 		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:sys:5a964db01320:golang_sys/vendor/golang.org/x/sys \
 		golang:time:f0f3c7e86c11:golang_time/vendor/golang.org/x/time \
 		klauspost:compress:v1.14.4:klauspost_compress/vendor/github.com/klauspost/compress \
 		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.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 \
 		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
 
 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 305d060f963b..661617aeb27d 100644
--- a/net/nats-server/distinfo
+++ b/net/nats-server/distinfo
@@ -1,25 +1,25 @@
-TIMESTAMP = 1653377823
-SHA256 (nats-io-nats-server-v2.8.3_GH0.tar.gz) = 1a93c2bb2120e75b3713b7d6643da03f31a958140b2f09144b89d00bae007d73
-SIZE (nats-io-nats-server-v2.8.3_GH0.tar.gz) = 1477751
+TIMESTAMP = 1653680924
+SHA256 (nats-io-nats-server-v2.8.4_GH0.tar.gz) = 172c5d04c3867adcb6b2322d87d7f7029b63e9465fffffcf99d4ca652820635f
+SIZE (nats-io-nats-server-v2.8.4_GH0.tar.gz) = 1479734
 SHA256 (golang-crypto-3147a52a75dd_GH0.tar.gz) = 25542a72981bc3c33fca702a21feae4d6242298255354cfa2359d6195ff8656a
 SIZE (golang-crypto-3147a52a75dd_GH0.tar.gz) = 1630551
 SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
 SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
 SHA256 (golang-sys-5a964db01320_GH0.tar.gz) = ab75cf42cf98e0805ae507a9e4852324f7ea88cac4baaf3053e2ec90c3f56cf0
 SIZE (golang-sys-5a964db01320_GH0.tar.gz) = 1256823
 SHA256 (golang-time-f0f3c7e86c11_GH0.tar.gz) = 421890dd6e4b7e8d5ca68cc163c8b3b08436898664534aedfefd8602e11a4e53
 SIZE (golang-time-f0f3c7e86c11_GH0.tar.gz) = 9626
 SHA256 (klauspost-compress-v1.14.4_GH0.tar.gz) = 30480619257f7d40fcbfd61b59c34fd36e85220ac2eee400c493b06c37f53740
 SIZE (klauspost-compress-v1.14.4_GH0.tar.gz) = 15502117
 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.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 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
 SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648