diff --git a/net/kea-devel/Makefile b/net/kea-devel/Makefile
index 3c98f7fe5bb7..a717243022c3 100644
--- a/net/kea-devel/Makefile
+++ b/net/kea-devel/Makefile
@@ -1,66 +1,68 @@
 PORTNAME=	kea
 DISTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ISC/kea/cur/3.0
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Alternative DHCP implementation by ISC
 WWW=		https://kea.isc.org/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils \
 		python3:lang/python3
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		liblog4cplus.so:devel/log4cplus
 
 USES=		compiler:c++11-lang cmake:indirect cpe iconv libtool meson \
 		pathfix python tar:xz ssl
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 .if ${DISTVERSION:M*-*}
 CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	AUTHORS CONTRIBUTING.md COPYING ChangeLog README SECURITY.md \
 		code_of_conduct.md examples platforms.rst
 
 OPTIONS_DEFINE=	DOCS MYSQL PGSQL
 OPTIONS_SUB=	yes
 
 MESON_ARGS=	--auto-features=disabled \
-		-Dnetconf=disabled
+		-Dnetconf=disabled \
+		-Drunstatedir=/var/run
 		
 MYSQL_USES=		mysql
 MYSQL_MESON_ENABLED=	mysql
 MYSQL_SUB_LIST=		REQ_MYSQL=mysql
 MYSQL_SUB_LIST_OFF=	REQ_MYSQL=""
 
 PGSQL_USES=		pgsql
 PGSQ_MESON_ENABLED=	postgresql
 PGSQL_SUB_LIST=		REQ_PGSQL=postgresql
 PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
 PGSQL_VARS=		WANT_PGSQL=client
 
 post-build:
 	cd ${WRKSRC}/doc/sphinx/man; \
 	for i in *.8.rst; do rst2man $$i > $$(basename $$i .rst); done
 
 post-install:
 	@mkdir -p ${STAGEDIR}${PREFIX}/etc/kea ${STAGEDIR}/var/db/kea \
 	${STAGEDIR}/var/lib/kea ${STAGEDIR}/var/run/kea
 	@rm -rf ${STAGEDIR}${PREFIX}/var
 	@cd ${WRKSRC}/doc/sphinx/man; \
 	cp *.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	@cd ${WRKSRC}/_build/src/bin/keactrl; \
 	for i in *.conf; do cp $$i ${STAGEDIR}${PREFIX}/etc/kea/$$i.sample; done
 
 .include <bsd.port.mk>
diff --git a/net/kea-devel/files/patch-meson.build b/net/kea-devel/files/patch-meson.build
index 3bd6a82abfe7..b93d0f9bc2a8 100644
--- a/net/kea-devel/files/patch-meson.build
+++ b/net/kea-devel/files/patch-meson.build
@@ -1,50 +1,57 @@
 --- meson.build.orig	2025-06-20 09:28:47.000000000 -0700
-+++ meson.build	2025-07-09 22:46:20.088250000 -0700
++++ meson.build	2025-07-10 02:34:01.835816000 -0700
 @@ -59,7 +59,7 @@
  # Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not.
  # So we revert what it does.
  if PREFIX == '/usr/local'
 -    LOCALSTATEDIR = 'var'    # Otherwise, it would have been 'var/local'.
 +    LOCALSTATEDIR = '/var'    # Otherwise, it would have been 'var/local'.
  endif
  
  DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts'
-@@ -69,10 +69,10 @@
+@@ -69,16 +69,16 @@
  KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin'
  KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc'
  KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
 -LOCALSTATEDIR_INSTALLED = PREFIX / LOCALSTATEDIR
 +LOCALSTATEDIR_INSTALLED = LOCALSTATEDIR
  LIBDIR_INSTALLED = PREFIX / LIBDIR
  LOGDIR = LOCALSTATEDIR / 'log/kea'
 -LOGDIR_INSTALLED = PREFIX / LOGDIR
 +LOGDIR_INSTALLED = LOGDIR
  if RUNSTATEDIR == ''
      RUNSTATEDIR = LOCALSTATEDIR / 'run/kea'
  else
+     RUNSTATEDIR = RUNSTATEDIR / 'kea'
+ endif
+-RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR
++RUNSTATEDIR_INSTALLED = RUNSTATEDIR
+ SHAREDSTATEDIR = LOCALSTATEDIR / 'lib/kea'
+ SHAREDSTATEDIR_INSTALLED = PREFIX / SHAREDSTATEDIR
+ SYSCONFDIR_INSTALLED = PREFIX / SYSCONFDIR
 @@ -88,9 +88,9 @@
  # So we revert what it does.
  if PREFIX == '/usr/local'
      SYSCONFDIR_INSTALLED = '/usr/local/etc'
 -    LOGDIR_INSTALLED = '/usr/local/var/log/kea'
 -    RUNSTATEDIR_INSTALLED = '/usr/local/var/run/kea'
 -    SHAREDSTATEDIR_INSTALLED = '/usr/local/var/lib/kea'
 +    LOGDIR_INSTALLED = '/var/log/kea'
 +    RUNSTATEDIR_INSTALLED = '/var/run/kea'
 +    SHAREDSTATEDIR_INSTALLED = '/var/lib/kea'
  endif
  
  #### Build Options
 @@ -1108,9 +1108,9 @@
  # In case prefix is default, install to hardcoded path.
  if PREFIX == '/usr/local'
      install_emptydir('/usr/local/lib/kea')
 -    install_emptydir('/usr/local/var/lib/kea')
 -    install_emptydir('/usr/local/var/log/kea')
 -    install_emptydir('/usr/local/var/run/kea')
 +    install_emptydir('/var/lib/kea')
 +    install_emptydir('/var/log/kea')
 +    install_emptydir('/var/run/kea')
  endif
  
  # Print the setup report.