diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index b6d56556fc37..cbb8b486b095 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -1,26 +1,27 @@
 PORTNAME=	nats-streaming-server
 PORTVERSION=	0.21.1
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Streaming system server for NATS
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
 
 USE_RC_SUBR=	nats_streaming.sh
 
 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/files/nats_streaming.sh.in b/net/nats-streaming-server/files/nats_streaming.sh.in
index 8ecec9398803..79c7d429b7bd 100644
--- a/net/nats-streaming-server/files/nats_streaming.sh.in
+++ b/net/nats-streaming-server/files/nats_streaming.sh.in
@@ -1,28 +1,29 @@
 #!/bin/sh
 #
 # PROVIDE: nats_streaming
 # REQUIRE: DAEMON
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to run the NATS streaming server:
 #
 # nats_streaming_enable (bool):	Set it to "YES" to enable nats_streaming server.
 #				Default is "NO".
 # nats_streaming_username:	User name to run as. default "nobody"
 # nats_streaming_options:	Options to pass nats_streaming server
 #
 
 . /etc/rc.subr
 
-name="nats_streaming"
+name=nats_streaming
 rcvar=`set_rcvar`
 
 load_rc_config ${name}
-: ${nats_streaming_enable="NO"}
-: ${nats_streaming_username="nobody"}
+: ${nats_streaming_enable:=NO}
+: ${nats_streaming_username:=nobody}
 : ${nats_streaming_options="-c %%PREFIX%%/etc/nats_streaming.conf"}
 
 command=/usr/sbin/daemon
 procname=%%PREFIX%%/bin/nats-streaming-server
 command_args="-u ${nats_streaming_username} ${procname} ${nats_streaming_options}"
 
 run_rc_command "$1"