Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -1517,6 +1517,7 @@
     SUBDIR += virtualmin
     SUBDIR += vivid
     SUBDIR += vm-bhyve
+    SUBDIR += vm-bhyve-devel
     SUBDIR += vmdktool
     SUBDIR += vmtouch
     SUBDIR += vobcopy
Index: sysutils/vm-bhyve-devel/Makefile
===================================================================
--- sysutils/vm-bhyve-devel/Makefile
+++ sysutils/vm-bhyve-devel/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	vm-bhyve
-PORTVERSION=	1.4.2
+DISTVERSION=	ec0e12e
 CATEGORIES=	sysutils
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	churchers@gmail.com
+MAINTAINER=	driesm@FreeeBSD.org
 COMMENT=	Management system for bhyve virtual machines
 
 LICENSE=	BSD2CLAUSE
@@ -13,6 +14,8 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	churchers
 
+CONFLICTS_INSTALL=	vm-bhyve
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
Index: sysutils/vm-bhyve-devel/distinfo
===================================================================
--- /dev/null
+++ sysutils/vm-bhyve-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1657359068
+SHA256 (churchers-vm-bhyve-ec0e12e_GH0.tar.gz) = 288e0c1d103711913fb31a15cd4d7b3af8b577f27b4893d2d37ba78b3cc7d083
+SIZE (churchers-vm-bhyve-ec0e12e_GH0.tar.gz) = 75805
Index: sysutils/vm-bhyve-devel/pkg-descr
===================================================================
--- /dev/null
+++ sysutils/vm-bhyve-devel/pkg-descr
@@ -0,0 +1,6 @@
+A frontend for bhyve which provides the 'vm' command
+Create/start/stop virtual machines easily
+Bridged/NAT networking
+BSD/Linux/Windows guest support
+
+WWW: https://github.com/churchers/vm-bhyve
Index: sysutils/vm-bhyve-devel/pkg-message
===================================================================
--- /dev/null
+++ sysutils/vm-bhyve-devel/pkg-message
@@ -0,0 +1,25 @@
+[
+{ type: install
+  message: <<EOM
+To enable vm-bhyve, please add the following lines to rc.conf,
+depending on whether you are using ZFS storage or not. Please note
+that the directory or dataset specified should already exist.
+
+    vm_enable="YES"
+    vm_dir="zfs:pool/dataset"
+
+OR
+
+    vm_enable="YES"
+    vm_dir="/directory/path"
+
+Then run 'vm init'.
+EOM
+}
+{ type: upgrade, maximum_version: 1.2
+  message: <<EOM
+Please note, if upgrading from version 1.1, it is advised to shutdown guests
+and restart the host in order to re-create all virtual switches using new identifiers.
+EOM
+}
+]
Index: sysutils/vm-bhyve-devel/pkg-plist
===================================================================
--- /dev/null
+++ sysutils/vm-bhyve-devel/pkg-plist
@@ -0,0 +1,37 @@
+etc/rc.d/vm
+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-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-standard
+lib/vm-bhyve/vm-switch-vale
+lib/vm-bhyve/vm-switch-vxlan
+lib/vm-bhyve/vm-util
+lib/vm-bhyve/vm-zfs
+man/man8/vm.8.gz
+sbin/vm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arch.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coreos.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dragonfly.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freepbx.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linux-zvol.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resflash.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf
Index: sysutils/vm-bhyve/Makefile
===================================================================
--- sysutils/vm-bhyve/Makefile
+++ sysutils/vm-bhyve/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	vm-bhyve
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	churchers@gmail.com
@@ -13,6 +14,8 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	churchers
 
+CONFLICTS_INSTALL=	vm-bhyve-devel
+
 NO_ARCH=	yes
 NO_BUILD=	yes