diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 91b9314cc456..14cfbcba702c 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	telegraf
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.38.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Time-series data collection
 WWW=		https://influxdata.com/time-series-platform/telegraf/
 
 LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7
 
 USES=		go:modules
 
 USE_RC_SUBR=	telegraf
 
 GO_MODULE=	github.com/influxdata/telegraf
 GO_BUILDFLAGS=	-ldflags "-X github.com/influxdata/telegraf/internal.Version=${DISTVERSION}"
 GO_TARGET=	./cmd/telegraf
 
 SUB_FILES=	telegraf
 SUB_LIST=	TELEGRAF_USER=${TELEGRAF_USER} \
 		TELEGRAF_GROUP=${TELEGRAF_GROUP} \
 		TELEGRAF_LOGDIR=${TELEGRAF_LOGDIR}
 PLIST_SUB=	TELEGRAF_USER=${TELEGRAF_USER} \
 		TELEGRAF_GROUP=${TELEGRAF_GROUP} \
 		TELEGRAF_LOGDIR=${TELEGRAF_LOGDIR}
 
 TELEGRAF_USER=	telegraf
 TELEGRAF_GROUP=	telegraf
 
 USERS=		${TELEGRAF_USER}
 GROUPS=		${TELEGRAF_GROUP}
 
 TELEGRAF_LOGDIR=/var/log/${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config/config.go
 
 post-install:
 	${MKDIR} ${STAGEDIR}${TELEGRAF_LOGDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/telegraf/files/telegraf.in b/net-mgmt/telegraf/files/telegraf.in
index 2a76706af639..c8c1a42a8d07 100644
--- a/net-mgmt/telegraf/files/telegraf.in
+++ b/net-mgmt/telegraf/files/telegraf.in
@@ -1,83 +1,87 @@
 #!/bin/sh
 
 # PROVIDE: telegraf
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable telegrafb:
 # telegraf_enable="YES"
 #
 # telegraf_enable (bool):	Set to YES to enable telegraf
 #				Default: NO
 # telegraf_conf (str):		telegraf configuration file
 #				Default: ${PREFIX}/etc/telegraf.conf
 # telegraf_confdir (str):	telegraf configuration directory
 #				Default: none
 # telegraf_user (str):		telegraf daemon user
 #				Default: %%TELEGRAF_USER%%
 # telegraf_group (str):		telegraf daemon group
 #				Default: %%TELEGRAF_GROUP%%
 # telegraf_flags (str):		Extra flags passed to telegraf
 #				Default: --quiet
 
 . /etc/rc.subr
 
 PATH=${PATH}:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin
 
 name="telegraf"
 rcvar=telegraf_enable
 load_rc_config $name
 
 : ${telegraf_enable:="NO"}
 : ${telegraf_user:="%%TELEGRAF_USER%%"}
 : ${telegraf_group:="%%TELEGRAF_GROUP%%"}
 : ${telegraf_flags:="--quiet"}
 : ${telegraf_conf:="%%PREFIX%%/etc/${name}.conf"}
 : ${telegraf_confdir:=""}
 : ${telegraf_options:="${telegraf_flags} --config=${telegraf_conf}"}
 
 if [ -n "${telegraf_confdir}" ]; then
 	telegraf_options="${telegraf_options} --config-directory=${telegraf_confdir}"
 fi
 
 logfile="%%TELEGRAF_LOGDIR%%/${name}.log"
 pidfile="/var/run/${name}.pid"
 command=/usr/sbin/daemon
 start_precmd="telegraf_prestart"
 start_cmd="telegraf_start"
 stop_cmd="telegraf_stop"
 
 telegraf_prestart()
 {
     if [ ! -r "${telegraf_conf}" ]; then
         echo WARNING: missing ${name} configuration. Start aborted.
         exit 1
     fi
     install -d -o ${telegraf_user} -g ${telegraf_group} -m 750 %%TELEGRAF_LOGDIR%%
-    if ! %%PREFIX%%/bin/${name} --test ${telegraf_options} > /dev/null 2>&1; then
+    _check_args="--config=${telegraf_conf}"
+    if [ -n "${telegraf_confdir}" ]; then
+        _check_args="${_check_args} --config-directory=${telegraf_confdir}"
+    fi
+    if ! %%PREFIX%%/bin/${name} config check ${_check_args} > /dev/null 2>&1; then
         echo WARNING: failing to start ${name} ${telegraf_options}
         echo Try running ${name} --test ${telegraf_options}
         exit 1
     fi
 }
 
 telegraf_start()
 {
     echo "Starting ${name}"
     /usr/sbin/daemon -fcr -P ${pidfile} -u ${telegraf_user} -o ${logfile} \
         %%PREFIX%%/bin/${name} ${telegraf_options}
 }
 
 telegraf_stop()
 {
     pid=$(check_pidfile $pidfile $command)
     if [ -n "${pid}" ]; then
         echo "Stopping ${name} (pid=${pid})"
         kill -- -${pid}
         wait_for_pids ${pid}
     else
         echo "${name} isn't running"
     fi
 }
 
 run_rc_command "$1"