diff --git a/sysutils/bmd/Makefile b/sysutils/bmd/Makefile
index 4bc82e92de7d..6293fbdb2475 100644
--- a/sysutils/bmd/Makefile
+++ b/sysutils/bmd/Makefile
@@ -1,22 +1,21 @@
 PORTNAME=	bmd
-DISTVERSION=	2.3
-PORTREVISION=	1
+DISTVERSION=	3.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	naito.yuichiro@gmail.com
 COMMENT=	Bhyve Management Daemon
 WWW=		https://github.com/yuichiro-naito/bmd
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	bhyve runs on amd64 only
 
 RUN_DEPENDS=	bhyve-firmware>0:sysutils/bhyve-firmware \
 		grub2-bhyve>0:sysutils/grub2-bhyve
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuichiro-naito
 
 .include <bsd.port.mk>
diff --git a/sysutils/bmd/distinfo b/sysutils/bmd/distinfo
index 0121187749a8..60a56d8db5b1 100644
--- a/sysutils/bmd/distinfo
+++ b/sysutils/bmd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709649980
-SHA256 (yuichiro-naito-bmd-2.3_GH0.tar.gz) = 807abfbac0a845c998b16c54b593d4bd59c35fc83891801f5fead70e87f69531
-SIZE (yuichiro-naito-bmd-2.3_GH0.tar.gz) = 68487
+TIMESTAMP = 1728455643
+SHA256 (yuichiro-naito-bmd-3.1_GH0.tar.gz) = beff31d68ace1784f2e376d7bede8e9416aa1e76ee6b4033b434137b8779d4e6
+SIZE (yuichiro-naito-bmd-3.1_GH0.tar.gz) = 85244
diff --git a/sysutils/bmd/files/patch-Makefile b/sysutils/bmd/files/patch-Makefile
index 512222015b0b..49d5b98ed5b8 100644
--- a/sysutils/bmd/files/patch-Makefile
+++ b/sysutils/bmd/files/patch-Makefile
@@ -1,24 +1,23 @@
---- Makefile.orig	2024-03-04 14:55:37 UTC
+--- Makefile.orig	2024-10-07 06:15:41 UTC
 +++ Makefile
 @@ -1,10 +1,20 @@
 +BINOWN!=	id -u
 +BINGRP!=	id -g
 +DIROWN=		$(BINOWN)
 +DIRGRP=		$(BINGRP)
 +SHAREOWN=	$(BINOWN)
 +SHAREGRP=	$(BINGRP)
  MK_DEBUG_FILES?=	no
  SUBDIR=		rc.d
  BINDIR=		$(LOCALBASE)/sbin
--MANDIR=		$(LOCALBASE)/man/man
-+MANDIR=		$(LOCALBASE)/share/man/man
+ MANDIR=		$(LOCALBASE)/share/man/man
  DIRS=		UEFIVARDIR PLUGINDIR
  UEFIVARDIR=	$(LOCALBASE)/var/cache/bmd
 +UEFIVARDIR_OWN=	$(BINOWN)
 +UEFIVARDIR_GRP=	$(BINGRP)
  PLUGINDIR=	$(LOCALBASE)/libexec/bmd
 +PLUGINDIR_OWN=	$(BINOWN)
 +PLUGINDIR_GRP=	$(BINGRP)
  PROG=		bmd
  MAN=		bmd.8 bmdctl.8 bmd.conf.5
  LINKS=  	${BINDIR}/bmd ${BINDIR}/bmdctl
diff --git a/sysutils/bmd/files/patch-rc.d_Makefile b/sysutils/bmd/files/patch-rc.d_Makefile
index 3551d9dce548..92b0e4ac3769 100644
--- a/sysutils/bmd/files/patch-rc.d_Makefile
+++ b/sysutils/bmd/files/patch-rc.d_Makefile
@@ -1,11 +1,11 @@
 --- rc.d/Makefile.orig	2023-08-08 05:39:45 UTC
 +++ rc.d/Makefile
 @@ -2,6 +2,8 @@ SCRIPTSDIR=	$(LOCALBASE)/etc/rc.d
  SCRIPTS=	bmd
  SCRIPTSNAME_bmd=bmd
  SCRIPTSDIR=	$(LOCALBASE)/etc/rc.d
 +SCRIPTSOWN!=	id -u
 +SCRIPTSGRP!=	id -g
 
  bmd:	bmd.in
-	sed 's|%%LOCALBASE%%|$(LOCALBASE)|' < bmd.in > bmd
+	sed 's|%%LOCALBASE%%|$(LOCALBASE)|' < ${.ALLSRC} > ${.TARGET}