diff --git a/sysutils/vm-bhyve/Makefile b/sysutils/vm-bhyve/Makefile
index c17f3502e3be..bf3563db4927 100644
--- a/sysutils/vm-bhyve/Makefile
+++ b/sysutils/vm-bhyve/Makefile
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	vm-bhyve
-PORTVERSION=	1.0.4
+PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
 MAINTAINER=	churchers@gmail.com
 COMMENT=	Management system for bhyve virtual machines
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	EXAMPLES
 EXAMPLES_DESC=	Install example guest templates
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	churchers
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000000
 IGNORE=		this port works only on FreeBSD 10 and newer
 .endif
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/vm ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/vm ${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}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/vm-bhyve/distinfo b/sysutils/vm-bhyve/distinfo
index d67fe59f19d3..c459d54b251c 100644
--- a/sysutils/vm-bhyve/distinfo
+++ b/sysutils/vm-bhyve/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465376920
-SHA256 (churchers-vm-bhyve-v1.0.4_GH0.tar.gz) = f63e0d77ecbb7a9755e3d149b68a966dccb0b63682f5590023187a55b9436393
-SIZE (churchers-vm-bhyve-v1.0.4_GH0.tar.gz) = 48953
+TIMESTAMP = 1467982975
+SHA256 (churchers-vm-bhyve-v1.1.1_GH0.tar.gz) = 84a99091a749d9e70fdc88074c926487920e98b7f127b5056d52f74aa938a0ce
+SIZE (churchers-vm-bhyve-v1.1.1_GH0.tar.gz) = 54388
diff --git a/sysutils/vm-bhyve/pkg-message b/sysutils/vm-bhyve/pkg-message
new file mode 100644
index 000000000000..da251aa71dec
--- /dev/null
+++ b/sysutils/vm-bhyve/pkg-message
@@ -0,0 +1,24 @@
+To enable vm-bhyve, please add the following lines to /etc/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'.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+If upgrading from 1.0 or earlier, please note that the 'guest'
+configuration option is no longer used.
+
+Guests that are not using UEFI boot will need either loader="grub"
+or loader="bhyveload" in their configuration in order to make sure
+the correct loader is used.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/sysutils/vm-bhyve/pkg-plist b/sysutils/vm-bhyve/pkg-plist
index 922cb272db31..6c3c617f9632 100644
--- a/sysutils/vm-bhyve/pkg-plist
+++ b/sysutils/vm-bhyve/pkg-plist
@@ -1,24 +1,25 @@
 etc/rc.d/vm
 lib/vm-bhyve/vm-cmd
-lib/vm-bhyve/vm-common
 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-rctl
 lib/vm-bhyve/vm-run
 lib/vm-bhyve/vm-switch
-lib/vm-bhyve/vm-sysrc
+lib/vm-bhyve/vm-util
 lib/vm-bhyve/vm-zfs
 man/man8/vm.8.gz
 sbin/vm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpine.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos6.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/centos7.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.sample
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/default.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/freebsd-zvol.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/netbsd.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/openbsd.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ubuntu.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/windows.conf