diff --git a/sysutils/node_exporter/Makefile b/sysutils/node_exporter/Makefile
index 0374b582d3c1..ba0da5497dc7 100644
--- a/sysutils/node_exporter/Makefile
+++ b/sysutils/node_exporter/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	node_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 
 MAINTAINER=	dor.bsd@xm0.uk
 COMMENT=	Prometheus exporter for machine metrics
 WWW=		https://github.com/prometheus/node_exporter
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake go:modules shebangfix
 USE_RC_SUBR=	node_exporter
 
 GO_MODULE=	github.com/prometheus/${PORTNAME}
 GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
 
 OPTIONS_DEFINE=	DOCS
 
 BUILD_USER?=		${USER}
 LD_FLAG_STRING=		-s \
 			${LD_FLAG_X_PREFIX}.Version=${DISTVERSION} \
 			${LD_FLAG_X_PREFIX}.Revision=${DISTREVISION} \
 			${LD_FLAG_X_PREFIX}.Branch=release-${DISTVERSION:R} \
 			${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}
 LD_FLAG_X_PREFIX=	-X github.com/prometheus/common/version
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/node_exporter/files/node_exporter.in b/sysutils/node_exporter/files/node_exporter.in
index b6e452dd3780..b40aa85a8af8 100644
--- a/sysutils/node_exporter/files/node_exporter.in
+++ b/sysutils/node_exporter/files/node_exporter.in
@@ -1,68 +1,70 @@
 #!/bin/sh
 
 # PROVIDE: node_exporter
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # node_exporter_enable (bool):          Set to NO by default.
 #               Set it to YES to enable node_exporter.
 # node_exporter_user (string):          Set user that node_exporter will run under
 #               Default is "nobody".
 # node_exporter_group (string):         Set group that node_exporter will run under
 #               Default is "nobody".
 # node_exporter_args (string):          Set extra arguments to pass to node_exporter
 #               Default is "".
 # node_exporter_listen_address (string):Set ip:port that node_exporter will listen on
 #               Default is ":9100".
 # node_exporter_textfile_dir (string):  Set directory that node_exporter will watch
 #               Default is "/var/tmp/node_exporter".
+# node_exporter_pidfile (string):       Set location of the node_exporter pidfile
+#               Default is "/var/run/node_exporter.pid".
 
 . /etc/rc.subr
 
 name=node_exporter
 rcvar=node_exporter_enable
 
 load_rc_config $name
 
 : ${node_exporter_enable:="NO"}
 : ${node_exporter_user:="nobody"}
 : ${node_exporter_group:="nobody"}
 : ${node_exporter_args:=""}
 : ${node_exporter_listen_address:=":9100"}
 : ${node_exporter_textfile_dir:="/var/tmp/node_exporter"}
+: ${node_exporter_pidfile:="/var/run/node_exporter.pid"}
 
 
-pidfile=/var/run/node_exporter.pid
 command="/usr/sbin/daemon"
 procname="%%PREFIX%%/bin/node_exporter"
-command_args="-f -p ${pidfile} -T ${name} \
+command_args="-f -p ${node_exporter_pidfile} -T ${name} \
     /usr/bin/env ${procname} \
     --web.listen-address=${node_exporter_listen_address} \
     --collector.textfile.directory=${node_exporter_textfile_dir} \
     ${node_exporter_args}"
 
 start_precmd=node_exporter_startprecmd
 
 node_exporter_startprecmd()
 {
-    if [ ! -e ${pidfile} ]; then
+    if [ ! -e ${node_exporter_pidfile} ]; then
         install \
             -o ${node_exporter_user} \
             -g ${node_exporter_group} \
-            /dev/null ${pidfile};
+            /dev/null ${node_exporter_pidfile};
     fi
     if [ ! -d ${node_exporter_textfile_dir} ]; then
         install \
             -d \
             -o ${node_exporter_user} \
             -g ${node_exporter_group} \
             -m 1755 \
             ${node_exporter_textfile_dir}
     fi
 }
 
 load_rc_config $name
 run_rc_command "$1"