diff --git a/textproc/kibana8/Makefile b/textproc/kibana8/Makefile
index eee28b4a18c7..833d77bebd89 100644
--- a/textproc/kibana8/Makefile
+++ b/textproc/kibana8/Makefile
@@ -1,118 +1,118 @@
 PORTNAME=	kibana
-DISTVERSION=	8.5.2
+DISTVERSION=	8.5.3
 DISTVERSIONSUFFIX=	-darwin-x86_64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.elastic.co/downloads/kibana/ \
 		http://artifacts.elastic.co/downloads/kibana/
 PKGNAMESUFFIX=	8
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Browser based analytics and search interface to ElasticSearch
 WWW=		https://www.elastic.co/products/kibana
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/npm:www/npm-node16
 LIB_DEPENDS=	libre2.so:devel/re2 \
 		libuv.so:devel/libuv
 RUN_DEPENDS=	${LOCALBASE}/bin/node:www/node16
 
 USES=		compiler:c++14-lang cpe nodejs:16,build,run python:build
 CPE_VENDOR=	elastic
 
 USE_GITHUB=	nodefault
 GH_TUPLE=	nodejs:nan:v${_NODE_NAN_VER}:node_nan \
 		uhop:node-re2:${_NODE_RE2_VER}:node_re2
 
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	kibana7
 
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 
 PORTSCOUT=	limit:^8
 
 SUB_FILES=	pkg-deinstall pkg-message
 SUB_LIST+=	BINDIR=${PREFIX}/bin \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX} \
 		PORTNAME=${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 BINS=		kibana-encryption-keys kibana-keystore kibana-plugin \
 		kibana-setup kibana-verification-code
 
 #######################################################################
 # Set node-nan version here
 _NODE_NAN_VER=	2.17.0
 # Set node-re version here
 _NODE_RE2_VER=	1.17.8
 #######################################################################
 
 _NODECMD=	${LOCALBASE}/bin/node --version
 _DEVDIR:=	${WRKDIR}/.devdir
 
 _RE2DIR=	${WRKDIR}/node-re2-${_NODE_RE2_VER}
 
 # Extra patch files must be updated whenever node-re2 changes
 _RE2PATCHES=	${PATCHDIR}/extra-node-re2-binding-gyp.patch
 
 post-patch:
 	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete
 	cd ${_RE2DIR} && ${PATCH} -p0 < ${_RE2PATCHES}
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 	-e "s|%%DEVDIR%%|${_DEVDIR}|g" ${_RE2DIR}/binding.gyp \
 
 pre-configure:
 	( \
 	_NODEVER=$$(${_NODECMD} | ${SED} -n 's|^v\(.*\)|\1|p') && \
 	${MKDIR} ${_DEVDIR}/$${_NODEVER}/include && \
 	${RLN} ${LOCALBASE}/include/node ${_DEVDIR}/$${_NODEVER}/include/node && \
 	${ECHO} "9" > ${_DEVDIR}/$${_NODEVER}/installVersion \
 	)
 
 do-configure:
 	${MKDIR} ${_DEVDIR}/nan
 	(cd ${WRKDIR}/nan-${_NODE_NAN_VER} && ${COPYTREE_SHARE} . \
 		${_DEVDIR}/nan \
 		"! ( -name \.* -or -path *\/test\/* -or -name test )")
 	(cd ${_RE2DIR} && \
 		${SETENV} HOME=${WRKDIR} \
 		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp configure \
 		--python=${PYTHON_CMD} \
 		--devdir=${_DEVDIR})
 
 do-build:
 	(cd ${_RE2DIR} && \
 		${SETENV} HOME=${WRKDIR} \
 		${LOCALBASE}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp build \
 		--devdir=${_DEVDIR})
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample
 	(cd ${WRKSRC} && \
 		${RM} -r config node optimize && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \
 		${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})
 	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config
 	${MKDIR} ${STAGEDIR}${WWWDIR}/node/bin
 	${LN} -s ${LOCALBASE}/bin/node ${STAGEDIR}${WWWDIR}/node/bin/node
 	${RM} ${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node
 	${INSTALL_LIB} ${_RE2DIR}/build/Release/re2.node \
 		${STAGEDIR}${WWWDIR}/node_modules/re2/build/Release/re2.node
 .for f in ${BINS}
 	${INSTALL} -l rs ${STAGEDIR}${WWWDIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 	${ECHO} "bin/${f}" >> ${TMPPLIST}
 .endfor
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/logs" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/kibana8/distinfo b/textproc/kibana8/distinfo
index f16b50637a35..0c43143e6786 100644
--- a/textproc/kibana8/distinfo
+++ b/textproc/kibana8/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1669456190
-SHA256 (kibana-8.5.2-darwin-x86_64.tar.gz) = d568576f7daac371aab10409381450cae27a919fc7aa613bac62b11f0a338030
-SIZE (kibana-8.5.2-darwin-x86_64.tar.gz) = 150384461
+TIMESTAMP = 1670966063
+SHA256 (kibana-8.5.3-darwin-x86_64.tar.gz) = 5df94f135e6b25fbce02618914544b18d1193e6e71a6daa8281afded896f8bb3
+SIZE (kibana-8.5.3-darwin-x86_64.tar.gz) = 150367363
 SHA256 (nodejs-nan-v2.17.0_GH0.tar.gz) = bcf5dfe59c26377b2096d903ecf6c2dbdae92528b1373a0565c40fe07537610d
 SIZE (nodejs-nan-v2.17.0_GH0.tar.gz) = 179443
 SHA256 (uhop-node-re2-1.17.8_GH0.tar.gz) = 4cf8c52cd92ae26eff9b26a9a213ea25eb97fbe381da2a5755c6ea8015ee347f
 SIZE (uhop-node-re2-1.17.8_GH0.tar.gz) = 41523
diff --git a/textproc/kibana8/files/kibana.in b/textproc/kibana8/files/kibana.in
index 4b64a40c487a..101be36fbb34 100644
--- a/textproc/kibana8/files/kibana.in
+++ b/textproc/kibana8/files/kibana.in
@@ -1,84 +1,81 @@
 #!/bin/sh
 
 # PROVIDE: kibana
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 . /etc/rc.subr
 
 name=kibana
 rcvar=kibana_enable
 
 load_rc_config $name
 
 : ${kibana_enable:="NO"}
 : ${kibana_config:="%%ETCDIR%%/kibana.yml"}
 : ${kibana_user:="www"}
 : ${kibana_group:="www"}
 : ${kibana_log:="/var/log/kibana.log"}
 : ${kibana_syslog_output_enable:="NO"}
 
 start_precmd="kibana_start_precmd"
 reload_cmd="kibana_reload_cmd"
 extra_commands="reload"
 
 if checkyesno kibana_syslog_output_enable; then
 	if [ -n "${kibana_syslog_output_tag}" ]; then
 		kibana_syslog_output_flags="-T ${kibana_syslog_output_tag}"
 	else
 		kibana_syslog_output_flags="-T ${name}"
 	fi
 	if [ -n "${kibana_syslog_output_priority}" ]; then
 		kibana_syslog_output_flags="${kibana_syslog_output_flags} -s ${kibana_syslog_output_priority}"
 	fi
 	if [ -n "${kibana_syslog_output_facility}" ]; then
 		kibana_syslog_output_flags="${kibana_syslog_output_flags} -l ${kibana_syslog_output_facility}"
 	fi
 fi
 
 NODE="%%LOCALBASE%%/bin/node"
 
 required_files="${kibana_config}"
-pidfile="/var/run/${name}-daemon.pid"
-_kpidfile="/var/run/${name}.pid"
+pidfile="/var/run/${name}.pid"
+procname="${NODE}"
 
 command="/usr/sbin/daemon"
-command_args="-f ${kibana_syslog_output_flags} -P ${pidfile} -t ${name} \
+command_args="-f ${kibana_syslog_output_flags} -p ${pidfile} -t ${name} \
 	/usr/bin/env BABEL_DISABLE_CACHE=1 NODE_ENV=production ${kibana_env} \
 	${NODE} --no-warnings --max-http-header-size=65536 \
 	%%WWWDIR%%/src/cli/dist serve \
 	--config ${kibana_config} --log-file ${kibana_log} \
 	--xpack.reporting.enabled=false ${kibana_args}"
 
 kibana_start_precmd()
 {
 	if [ ! -e "${pidfile}" ]; then
 		install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${pidfile}
 	fi
-	if [ ! -e "${_kpidfile}" ]; then
-		install -m 0600 -o ${kibana_user} -g ${kibana_group} /dev/null ${_kpidfile}
-	fi
 	if [ ! -f ${kibana_log} ]; then
 		install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log}
 	fi
 	if [ ! -d %%WWWDIR%%/optimize ]; then
 		install -d -o ${kibana_user} -g ${kibana_group} %%WWWDIR%%/optimize
 	else
 		# We may have installed a plugin as root which will cause files in here
 		# to be owned by root:wheel. Fix with a chown.
 		chown -R ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize
 	fi
 }
 
 kibana_reload_cmd()
 {
 	if [ -z "$rc_pid" ]; then
 		_run_rc_notrunning
 		return 1
 	else
 		pkill -HUP -P ${rc_pid}
 	fi
 }
 
 run_rc_command "$1"