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,5 +1,5 @@
 PORTNAME=	nats-server
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
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
@@ -2,6 +2,7 @@
 #
 # PROVIDE: nats
 # REQUIRE: DAEMON
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to run NATS:
 #
@@ -13,12 +14,12 @@
 
 . /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
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
@@ -16,6 +16,7 @@ bin/nats-server
 %%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
@@ -25,6 +26,7 @@ bin/nats-server
 %%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