diff --git a/net-p2p/lidarr/Makefile b/net-p2p/lidarr/Makefile
index f8b2cab538c0..1ae9ddc1bd9b 100644
--- a/net-p2p/lidarr/Makefile
+++ b/net-p2p/lidarr/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	lidarr
 DISTVERSION=	2.1.7.4030
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/lidarr/Lidarr/releases/download/v${PORTVERSION}/
 DISTNAME=	Lidarr.master.${DISTVERSION}.freebsd-core-x64
 
 MAINTAINER=	michiel@vanbaak.eu
 COMMENT=	Music collection manager for Usenet and BitTorrent users
 WWW=		https://lidarr.audio
 
 LICENSE=	GPLv3
 
 # See https://github.com/radarr/radarr/issues/6668 for x86 support
 ONLY_FOR_ARCHS=	amd64
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
 		libiconv>0:converters/libiconv \
 		libinotify>0:devel/libinotify \
 		libunwind>0:devel/libunwind \
 		chromaprint>0:audio/chromaprint
 
 USES=		sqlite:3 ssl:run
 
 USE_RC_SUBR=	${PORTNAME}
 
 NO_BUILD=	YES
 
 SUB_FILES=	${PORTNAME} package_info pkg-message
 SUB_LIST=	DATADIR=${DATADIR} \
 		GROUPS=${GROUPS} \
 		MAINTAINER=${MAINTAINER} \
 		PKGVERSION=${PKGVERSION} \
 		PORTNAME=${PORTNAME} \
 		USERS=${USERS}
 
 WRKSRC=		${WRKDIR}/Lidarr
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	${RM} -rf ${WRKSRC}/Lidarr.Update
 
 do-install:
 	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}/bin/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/bin/ "! -name Lidarr"
 	${INSTALL_PROGRAM} ${WRKSRC}/Lidarr ${STAGEDIR}/${DATADIR}/bin/
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/package_info ${STAGEDIR}/${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/net-p2p/lidarr/files/lidarr.in b/net-p2p/lidarr/files/lidarr.in
index df009015b687..fe5dc36a157b 100644
--- a/net-p2p/lidarr/files/lidarr.in
+++ b/net-p2p/lidarr/files/lidarr.in
@@ -1,60 +1,60 @@
 #!/bin/sh
 
 # PROVIDE: %%PORTNAME%%
 # REQUIRE: LOGIN network
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf or use sysrc to enable %%PORTNAME%%
 # ${%%PORTNAME%%_enable="YES"}
 # Optionaly there are some other parameters
 # ${%%PORTNAME%%_user="%%USERS%%"}
 # ${%%PORTNAME%%_group="%%GROUPS%%"}
 # This stores %%PORTNAME%% data (e.g., databases, configs, logs)
 # ${%%PORTNAME%%_data_dir="%%PREFIX%%/%%PORTNAME%%"}
 # This stores the PID files that daemon will use
 # ${%%PORTNAME%%_pid_dir:="/var/run/%%PORTNAME%%"}
 
 . /etc/rc.subr
 name=%%PORTNAME%%
 rcvar=%%PORTNAME%%_enable
 load_rc_config $name
 
 : ${%%PORTNAME%%_enable:=NO}
 : ${%%PORTNAME%%_user:="%%USERS%%"}
 : ${%%PORTNAME%%_group:="%%GROUPS%%"}
 : ${%%PORTNAME%%_exec_dir:="%%DATADIR%%/bin"}
 : ${%%PORTNAME%%_data_dir:="%%PREFIX%%/%%PORTNAME%%"}
 : ${%%PORTNAME%%_pid_dir:="/var/run/%%PORTNAME%%"}
 
 pidfile="${%%PORTNAME%%_pid_dir}/${name}_daemon.pid"
 pidfile_child="${%%PORTNAME%%_pid_dir}/${name}_child.pid"
 command="/usr/sbin/daemon"
 
 
 start_precmd=${name}_precmd
 %%PORTNAME%%_precmd() {
-    export PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
+    export PATH="/sbin:/bin:/usr/sbin:/usr/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin"
 
     if [ ! -d ${%%PORTNAME%%_data_dir} ]; then
         install -d -o ${%%PORTNAME%%_user} -g ${%%PORTNAME%%_group} ${%%PORTNAME%%_data_dir}
     fi
     if [ ! -d ${%%PORTNAME%%_pid_dir} ]; then
         install -d -o ${%%PORTNAME%%_user} -g ${%%PORTNAME%%_group} ${%%PORTNAME%%_pid_dir}
     fi
 
     # .NET 6+ use dual mode sockets to avoid the separate AF handling.
     # disable .NET use of V6 if no ipv6 is configured.
     # See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259194#c17
     ifconfig -a -u -G lo | grep -q inet6
     if [ $? == 1 ]; then
         export DOTNET_SYSTEM_NET_DISABLEIPV6=1
     fi
 
     if [ `uname -K` -ge 1400092 ]; then
         export CLR_OPENSSL_VERSION_OVERRIDE=30
     fi
 
     rc_flags="-r -f -p ${pidfile_child} -P ${pidfile} ${%%PORTNAME%%_exec_dir}/Lidarr --data=${%%PORTNAME%%_data_dir} --nobrowser >> /dev/null 2>&1 ${rc_flags}"
 }
 
 run_rc_command "$1"