Index: release/Makefile.vagrant
===================================================================
--- release/Makefile.vagrant
+++ release/Makefile.vagrant
@@ -100,6 +100,8 @@
 
 virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf
 	cp ${.ALLSRC} virtualbox/
+virtualbox/Vagrantfile: ${.CURDIR}/scripts/Vagrantfile
+	cp ${.ALLSRC} virtualbox/
 
 vmware/vagrant.vmx:
 	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)
Index: release/scripts/Vagrantfile
===================================================================
--- /dev/null
+++ release/scripts/Vagrantfile
@@ -0,0 +1,15 @@
+Vagrant::Config.run do |config|
+  # This Vagrantfile is auto-generated by `vagrant package` to contain
+  # the MAC address of the box. Custom configuration should be placed in
+  # the actual `Vagrantfile` in this box.
+  config.vm.base_mac = "589CFC110000"
+end
+
+Vagrant.configure("2") do |config|
+  config.vm.synced_folder ".", "/vagrant", type: "rsync"
+end
+
+# Load include vagrant file if it exists after the auto-generated
+# so it can override any of the settings
+include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
+load include_vagrantfile if File.exist?(include_vagrantfile)
Index: sys/net/ieee_oui.h
===================================================================
--- sys/net/ieee_oui.h
+++ sys/net/ieee_oui.h
@@ -65,3 +65,5 @@
 /* Allocate 20 bits to bhyve */
 #define OUI_FREEBSD_BHYVE_LOW	OUI_FREEBSD(0x000001)
 #define OUI_FREEBSD_BHYVE_HIGH	OUI_FREEBSD(0x0fffff)
+#define OUI_FREEBSD_VAGRANT_LOW OUI_FREEBSD(0x110000)
+#define OUI_FREEBSD_VAGRANT_HIGH OUI_FREEBSD(0x11ffff)