diff --git a/net/nats-top/Makefile b/net/nats-top/Makefile
index 549459faf33e..b558fba66ae9 100644
--- a/net/nats-top/Makefile
+++ b/net/nats-top/Makefile
@@ -1,19 +1,30 @@
 PORTNAME=	nats-top
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Top like program monitor for NATS
 
 LICENSE=	MIT
 
-USES=		go
-GO_PKGNAME=	github.com/nats-io/nats-top
+USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 GH_PROJECT=	nats-top
+GH_TUPLE=	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		gizak:termui:e62b5929642a:gizak_termui/vendor/gopkg.in/gizak/termui.v1 \
+		golang:crypto:0ec3e9974c59:golang_crypto/vendor/golang.org/x/crypto \
+		golang:sys:fc99dfbffb4e:golang_sys/vendor/golang.org/x/sys \
+		mattn:go-runewidth:v0.0.1:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		nats-io:jwt:v1.1.0:nats_io_jwt/vendor/github.com/nats-io/jwt \
+		nats-io:nats-server:v2.1.9:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
+		nats-io:nkeys:v0.1.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 \
+		nsf:termbox-go:e8f6d27f72a2:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
+		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify
+GO_PKGNAME=	github.com/nats-io/nats-top
 PLIST_FILES=	bin/nats-top
 
 .include <bsd.port.mk>
diff --git a/net/nats-top/distinfo b/net/nats-top/distinfo
index 86845f29fd84..406d0b775215 100644
--- a/net/nats-top/distinfo
+++ b/net/nats-top/distinfo
@@ -1,3 +1,25 @@
-TIMESTAMP = 1472050956
-SHA256 (nats-io-nats-top-v0.3.2_GH0.tar.gz) = 98d0df8ebd3c0e0b4c6edc4f084520f643224d8a5d0519023c67c4d05db458b8
-SIZE (nats-io-nats-top-v0.3.2_GH0.tar.gz) = 182337
+TIMESTAMP = 1621003514
+SHA256 (nats-io-nats-top-v0.4.0_GH0.tar.gz) = 62e544bf83afb51764edc255dfa421d81da43450266ebec37a7a21925c38b5c7
+SIZE (nats-io-nats-top-v0.4.0_GH0.tar.gz) = 17446
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (gizak-termui-e62b5929642a_GH0.tar.gz) = 8de172145510472f80c1a4f35ed9847cec2fc07db386924c7d601f2571c244e4
+SIZE (gizak-termui-e62b5929642a_GH0.tar.gz) = 1794026
+SHA256 (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 737fd8da273ec11281d2ff8798d6847ab1be9ebfa94bbc5a7252e0b04e1373a5
+SIZE (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 1727772
+SHA256 (golang-sys-fc99dfbffb4e_GH0.tar.gz) = 009b8629e6f1369c3b9376d2e5fea53c0ebc8be89895719efb09a8a605d373d5
+SIZE (golang-sys-fc99dfbffb4e_GH0.tar.gz) = 1454968
+SHA256 (mattn-go-runewidth-v0.0.1_GH0.tar.gz) = cbb9dddf80c2f54b6c28feef5b9f04de8bac910c73d7f239a0afe3d6d365029f
+SIZE (mattn-go-runewidth-v0.0.1_GH0.tar.gz) = 5880
+SHA256 (nats-io-jwt-v1.1.0_GH0.tar.gz) = e03be076e4e9d7c3a8736ff067bd81808ac0955227a0316fac9a97847088f6ac
+SIZE (nats-io-jwt-v1.1.0_GH0.tar.gz) = 35288
+SHA256 (nats-io-nats-server-v2.1.9_GH0.tar.gz) = 643b3688063f9a626798ccdac419fc6dd814219113559c9995556cbd12d28049
+SIZE (nats-io-nats-server-v2.1.9_GH0.tar.gz) = 969583
+SHA256 (nats-io-nkeys-v0.1.4_GH0.tar.gz) = 6928e7a74e8dac41cec5c403fd7605541632428280cbd01c573ed90cde1849cc
+SIZE (nats-io-nkeys-v0.1.4_GH0.tar.gz) = 18534
+SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d
+SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529
+SHA256 (nsf-termbox-go-e8f6d27f72a2_GH0.tar.gz) = 85d814019b6a8db80573754b67204cdbefa5879a6786ec853cfb8f95b5084668
+SIZE (nsf-termbox-go-e8f6d27f72a2_GH0.tar.gz) = 30193
+SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
+SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073