diff --git a/sysutils/vm-bhyve-devel/Makefile b/sysutils/vm-bhyve-devel/Makefile
index 99eccecb3d2c..26a0dd4e7520 100644
--- a/sysutils/vm-bhyve-devel/Makefile
+++ b/sysutils/vm-bhyve-devel/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	vm-bhyve
 # Generate with 'git describe --tags' and break them up
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.99-77
 DISTVERSIONSUFFIX= -g41dbbba
+PORTREVISION=	1
 CATEGORIES=		sysutils
 PKGNAMESUFFIX=		-devel
 
 MAINTAINER=	vm-bhyve@FreeBSD.org
 COMMENT=	Management system for bhyve virtual machines
 WWW=		https://github.com/freebsd/vm-bhyve
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 CONFLICTS_INSTALL=	vm-bhyve
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		BHYVE_FIRMWARE EXAMPLES GRUB2_BHYVE TMUX
 BHYVE_FIRMWARE_DESC=	Required to run UEFI guests
 EXAMPLES_DESC=		Install example guest templates
 GRUB2_BHYVE_DESC=	Required to run Linux or any other guests that need a Grub bootloader
 TMUX_DESC=		Tmux console access instead of cu/nmdm
 
 BHYVE_FIRMWARE_RUN_DEPENDS=	bhyve-firmware>0:sysutils/bhyve-firmware
 GRUB2_BHYVE_RUN_DEPENDS=	grub2-bhyve>0:sysutils/grub2-bhyve
 TMUX_RUN_DEPENDS=		tmux:sysutils/tmux
 
 post-patch:
 	${REINPLACE_CMD} -E -e '5s#=.+$$#=${DISTVERSION}${DISTVERSIONSUFFIX}#' ${WRKSRC}/lib/vm-base
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/vm ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/vm ${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/vm_network ${STAGEDIR}${PREFIX}/etc/rc.d
 	(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/vm-bhyve)
 	(cd ${WRKSRC}/sample-templates/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	${INSTALL_MAN} ${WRKSRC}/vm.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/vm-bhyve-devel/pkg-plist b/sysutils/vm-bhyve-devel/pkg-plist
index d426c826b208..8bf7691b2783 100644
--- a/sysutils/vm-bhyve-devel/pkg-plist
+++ b/sysutils/vm-bhyve-devel/pkg-plist
@@ -1,40 +1,41 @@
 etc/rc.d/vm
 etc/rc.d/vm_network
 lib/vm-bhyve/vm-base
 lib/vm-bhyve/vm-cmd
 lib/vm-bhyve/vm-config
 lib/vm-bhyve/vm-core
 lib/vm-bhyve/vm-datastore
 lib/vm-bhyve/vm-guest
 lib/vm-bhyve/vm-help
 lib/vm-bhyve/vm-info
 lib/vm-bhyve/vm-migration
 lib/vm-bhyve/vm-rctl
 lib/vm-bhyve/vm-run
 lib/vm-bhyve/vm-switch
 lib/vm-bhyve/vm-switch-manual
 lib/vm-bhyve/vm-switch-netgraph
 lib/vm-bhyve/vm-switch-standard
 lib/vm-bhyve/vm-switch-vale
 lib/vm-bhyve/vm-switch-vxlan
+lib/vm-bhyve/vm-tags
 lib/vm-bhyve/vm-util
 lib/vm-bhyve/vm-zfs
 share/man/man8/vm.8.gz
 sbin/vm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/legacy-alpine.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/legacy-arch.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/legacy-debian.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/legacy-gentoo.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/legacy-ubuntu.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-grub.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-grub-zvol.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-zvol.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf