diff --git a/sysutils/bmd-plugin-avahi/Makefile b/sysutils/bmd-plugin-avahi/Makefile
index 3b0b70ac6d9c..f2926ab4c37f 100644
--- a/sysutils/bmd-plugin-avahi/Makefile
+++ b/sysutils/bmd-plugin-avahi/Makefile
@@ -1,25 +1,28 @@
 PORTNAME=	bmd-plugin-avahi
 DISTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	naito.yuichiro@gmail.com
 COMMENT=	BMD plugin avahi
 WWW=		https://github.com/yuichiro-naito/bmd-plugin-avahi
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	bhyve runs on amd64 only
 
 BUILD_DEPENDS=	bmd>0:sysutils/bmd
 RUN_DEPENDS=	bmd>0:sysutils/bmd \
 		avahi-app>0:net/avahi-app
 
+USES=		uidfix
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuichiro-naito
 
 pre-install:
 	${MKDIR} ${STAGEDIR}/${LOCALBASE}/libexec/bmd
 
 .include <bsd.port.mk>
diff --git a/sysutils/bmd-plugin-avahi/files/patch-Makefile b/sysutils/bmd-plugin-avahi/files/patch-Makefile
deleted file mode 100644
index 79310bf41bc2..000000000000
--- a/sysutils/bmd-plugin-avahi/files/patch-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig	2024-07-23 07:59:39 UTC
-+++ Makefile
-@@ -1,4 +1,6 @@
- MK_DEBUG_FILES=	no
-+BINOWN!=	id -u
-+BINGRP!=	id -g
- SHLIB=		bmdplugin_avahi
- SHLIB_MAJOR=	1
- CFLAGS+=	-I${LOCALBASE}/include -DLOCALBASE=\"${LOCALBASE}\"
diff --git a/sysutils/bmd-plugin-hookcmd/Makefile b/sysutils/bmd-plugin-hookcmd/Makefile
index 394740d4403b..2e0185611f12 100644
--- a/sysutils/bmd-plugin-hookcmd/Makefile
+++ b/sysutils/bmd-plugin-hookcmd/Makefile
@@ -1,24 +1,27 @@
 PORTNAME=	bmd-plugin-hookcmd
 DISTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	naito.yuichiro@gmail.com
 COMMENT=	BMD plugin hookcmd
 WWW=		https://github.com/yuichiro-naito/bmd-plugin-hookcmd
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	bhyve runs on amd64 only
 
 BUILD_DEPENDS=	bmd>0:sysutils/bmd
 RUN_DEPENDS=	bmd>0:sysutils/bmd
 
+USES=		uidfix
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuichiro-naito
 
 pre-install:
 	${MKDIR} ${STAGEDIR}/${LOCALBASE}/libexec/bmd
 
 .include <bsd.port.mk>
diff --git a/sysutils/bmd-plugin-hookcmd/files/patch-Makefile b/sysutils/bmd-plugin-hookcmd/files/patch-Makefile
deleted file mode 100644
index ed46beba33e0..000000000000
--- a/sysutils/bmd-plugin-hookcmd/files/patch-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig	2024-07-23 08:00:58 UTC
-+++ Makefile
-@@ -1,4 +1,6 @@
- MK_DEBUG_FILES=	no
-+BINOWN!=	id -u
-+BINGRP!=	id -g
- SHLIB=		bmdplugin_hookcmd
- SHLIB_MAJOR=	1
- CFLAGS+=	-I${LOCALBASE}/include -DLOCALBASE=\"${LOCALBASE}\"