Index: release/Makefile.vagrant
===================================================================
--- release/Makefile.vagrant	(revision 305573)
+++ release/Makefile.vagrant	(working copy)
@@ -63,10 +63,10 @@
 	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
 . if ${PROVIDER} == "virtualbox"
 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
-	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf vagrant.vmdk)
+	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf Vagrantfile vagrant.vmdk)
 . elif ${PROVIDER} == "vmware"
 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
-	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx vagrant.vmdk)
+	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx Vagrantfile vagrant.vmdk)
 . endif
 
 CLEANFILES+=	vagrant-do-upload-${PROVIDER}
@@ -85,6 +85,7 @@
 
 virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf
 	cp ${.ALLSRC} virtualbox/
+	cp ${.CURDIR}/scripts/Vagrantfile virtualbox/
 
 vmware/vagrant.vmx:
 	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)
Index: release/scripts/Vagrantfile
===================================================================
--- release/scripts/Vagrantfile	(nonexistent)
+++ release/scripts/Vagrantfile	(working copy)
@@ -0,0 +1,5 @@
+Vagrant::Config.run do |config|
+  config.vm.base_mac = "080027D14C66"
+  config.ssh.shell = "sh"
+  config.vm.guest = :freebsd
+end