diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile
index 6d5d02828bb7..fee80c80b377 100644
--- a/net/nats-server/Makefile
+++ b/net/nats-server/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	nats-server
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Messaging system written in Go
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 
 USE_RC_SUBR=	nats.sh
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${LN} -s ${WRKSRC} ${WRKSRC}/vendor/github.com/nats-io/nats-server
 
 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 c57caa9b89f2..b898f8052118 100644
--- a/net/nats-server/distinfo
+++ b/net/nats-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615797065
-SHA256 (nats-io-nats-server-v2.2.0_GH0.tar.gz) = fca2d79dc616b52f3fddd1bc19e6e11d2496ed048c2ca90c6a30d1fbf1b6c20d
-SIZE (nats-io-nats-server-v2.2.0_GH0.tar.gz) = 2421575
+TIMESTAMP = 1617802001
+SHA256 (nats-io-nats-server-v2.2.1_GH0.tar.gz) = ecb1683630b4459c77840fc6b22871f3b9274252b7831b7623c491ec44986e59
+SIZE (nats-io-nats-server-v2.2.1_GH0.tar.gz) = 2440377
diff --git a/net/nats-server/files/nats.sh.in b/net/nats-server/files/nats.sh.in
index a877119dd7b0..d78177158c26 100644
--- a/net/nats-server/files/nats.sh.in
+++ b/net/nats-server/files/nats.sh.in
@@ -1,28 +1,29 @@
 #!/bin/sh
 #
 # PROVIDE: nats
 # REQUIRE: DAEMON
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to run NATS:
 #
 # nats_enable (bool):		Set it to "YES" to enable nats server.
 #				Default is "NO".
 # nats_user:			User name to run as. default "nobody"
 # nats_options:			Options to pass nats server
 #
 
 . /etc/rc.subr
 
-name="nats"
+name=nats
 rcvar=`set_rcvar`
 
 load_rc_config ${name}
-: ${nats_enable="NO"}
-: ${nats_user="nobody"}
+: ${nats_enable:=NO}
+: ${nats_user:=nobody}
 : ${nats_options="-c %%PREFIX%%/etc/nats.conf"}
 
 command=/usr/sbin/daemon
 procname=%%PREFIX%%/bin/nats-server
 command_args="${procname} ${nats_options}"
 
 run_rc_command "$1"
diff --git a/net/nats-server/pkg-plist b/net/nats-server/pkg-plist
index 955d280da31a..abde9be02d92 100644
--- a/net/nats-server/pkg-plist
+++ b/net/nats-server/pkg-plist
@@ -1,67 +1,69 @@
 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/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_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