diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
index f2a3f20af986..57c9dd128b95 100644
--- a/www/grafana9/Makefile
+++ b/www/grafana9/Makefile
@@ -1,107 +1,108 @@
 PORTNAME=	grafana
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.3.8
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 PKGNAMESUFFIX=	${DISTVERSION:C/([0-9]).*/\1/1}
 DISTFILES=	${GRAFANA_PREBUILT}:public \
 		go.mod:gomod
 
 MAINTAINER=	drtr0jan@yandex.ru
 COMMENT=	Dashboard and graph editor for multiple data stores
 WWW=		https://github.com/grafana/grafana
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 BUILD_DEPENDS=	wire:devel/go-wire
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:modules
 
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
 TAG=		7ab70db
 
 GO_MODULE=	github.com/grafana/grafana
 GO_TARGET=	./pkg/cmd/grafana \
 		./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
 CONFLICTS_INSTALL=	grafana*
 
 SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_GROUP=${GRAFANA_GROUP} \
 		GRAFANA_DATADIR=${GRAFANA_DATADIR} \
 		GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR}
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
 
 USERS=		${GRAFANA_USER}
 GROUPS=		${GRAFANA_GROUP}
 
 PLIST_SUB=	${SUB_LIST}
 
 GRAFANA_PREBUILT=		grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}
 GRAFANA_DATADIR?=		/var/db/${PORTNAME}
 GRAFANA_HOMEDIR?=		${DATADIR}
 GRAFANA_LOGDIR?=		/var/log/${PORTNAME}
 GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
 GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
 
 do-extract: ${EXTRACT_WRKDIR}
 	@if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTFILE_DEFAULT} ${EXTRACT_AFTER_ARGS});\
 	then \
 		${ECHO_MSG} "===>  Failed to extract \"${_DISTDIR}/${GRAFANA_SOURCES}\"."; \
 		exit 1; \
 	fi;
 	@${RM} -r ${WRKSRC}/public
 	@${RM} -r ${WRKSRC}/plugins-bundled
 	@if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${GRAFANA_PREBUILT} ${EXTRACT_AFTER_ARGS});\
 	then \
 		${ECHO_MSG} "===>  Failed to extract \"${_DISTDIR}/${GRAFANA_PREBUILT}\"."; \
 		exit 1; \
 	fi
 	@if [ ${UID} = 0 ]; then \
 		${CHMOD} -R ug-s ${WRKDIR}; \
 		${CHOWN} -R 0:0 ${WRKDIR}; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
 		-e 's|;logs = /var/log/grafana|logs = ${GRAFANA_LOGDIR}|g' \
 		-e 's|;plugins = /var/lib/grafana/plugins|plugins = ${GRAFANA_PLUGINDIR}|g' \
 		-e 's|;provisioning = conf/provisioning|provisioning = ${GRAFANA_PROVISIONINGDIR}|g' \
 		 ${WRKSRC}/conf/sample.ini
 
 pre-build:
 	@(cd ${GO_WRKSRC}; \
 	${ECHO_MSG} "===>  Generating wire_gen.go"; \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} wire gen -tags "oss" ./pkg/server ./pkg/cmd/grafana-cli/runner )
 
 post-install:
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf
 	${MKDIR} ${STAGEDIR}${GRAFANA_DATADIR}
 	${MKDIR} ${STAGEDIR}${GRAFANA_PLUGINDIR}
 .for dir in access-control alerting dashboards datasources notifiers plugins
 	${MKDIR} ${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/${dir}
 .endfor
 	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
 	( cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
 	( cd ${WRKSRC} && ${COPYTREE_SHARE} plugins-bundled/internal ${STAGEDIR}${GRAFANA_HOMEDIR} )
 	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
 
 .include <bsd.port.mk>
diff --git a/www/grafana9/files/grafana.in b/www/grafana9/files/grafana.in
index d6c7df4bcae1..16abea5b3db0 100644
--- a/www/grafana9/files/grafana.in
+++ b/www/grafana9/files/grafana.in
@@ -1,77 +1,77 @@
 #!/bin/sh
 
 # PROVIDE: grafana
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable grafana
 # grafana_enable="YES"
 #
 # grafana_enable (bool):
 #     Set it to YES to enable grafana
 #     Set to NO by default
 # grafana_user (string):
 #     Set user that grafana will run under
 #     Default is "%%GRAFANA_USER%%"
 # grafana_group (string):
 #     Set group that own grafana files
 #     Default is "%%GRAFANA_GROUP%%"
 # grafana_config (string)
 #     Set full path to config file
 #     Default is "%%ETCDIR%%/grafana.ini"
 # grafana_homepath (string)
 #     Set full path to homepath dir
 #     Default is "%%GRAFANA_HOMEDIR%%"
 # grafana_syslog_output_enable (bool)
 #     Set it to YES to enable stdout/stderr syslog output
 #     Set to NO by default
 # grafana_syslog_output_tag (str)
 #     Set syslog tag if syslog enabled
 #     Default is "grafana"
 # grafana_args (string)
 #     Set additional command line arguments
 #     Default is ""
 
 . /etc/rc.subr
 
 name=grafana
 rcvar=grafana_enable
 
 load_rc_config $name
 
 : ${grafana_enable:="NO"}
 : ${grafana_user:="%%GRAFANA_USER%%"}
 : ${grafana_group:="%%GRAFANA_GROUP%%"}
 : ${grafana_config:="%%ETCDIR%%/grafana.ini"}
 : ${grafana_homepath:="%%GRAFANA_HOMEDIR%%"}
 : ${grafana_syslog_output_enable:="NO"}
 
 if checkyesno grafana_syslog_output_enable; then
 	if [ -n "${grafana_syslog_output_tag}" ]; then
 		grafana_syslog_output_flags="-T ${grafana_syslog_output_tag}"
 	else
 		grafana_syslog_output_flags="-T ${name}"
 	fi
 fi
 
 pidfile="/var/run/${name}/${name}.pid"
 required_files="${grafana_config}"
 
-procname="%%PREFIX%%/bin/grafana-server"
+procname="%%PREFIX%%/bin/grafana"
 command="/usr/sbin/daemon"
 command_args="-f ${grafana_syslog_output_flags} -p ${pidfile} -t ${name} \
-	/usr/bin/env ${grafana_env} ${procname} \
+	/usr/bin/env ${grafana_env} ${procname} server \
 	-config=${grafana_config} \
 	-homepath=${grafana_homepath} \
 	${grafana_args}"
 
 start_precmd="grafana_start_precmd"
 
 grafana_start_precmd()
 {
 	if [ ! -d "/var/run/${name}" ]; then
 		install -d -m 0750 -o ${grafana_user} -g ${grafana_group} "/var/run/${name}"
 	fi
 }
 
 run_rc_command "$1"