diff --git a/.gitignore b/.gitignore
index a1e6d9f..7f93cc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.pyc
 # When developing for ec2 `vagrant provision' is quite handy
-Vagrantfile
-.vagrant
+/Vagrantfile
+/.vagrant
diff --git a/plugins/vagrant/assets/Vagrantfile b/plugins/vagrant/assets/Vagrantfile
new file mode 100644
index 0000000..b3164ca
--- /dev/null
+++ b/plugins/vagrant/assets/Vagrantfile
@@ -0,0 +1,11 @@
+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 = "[MAC_ADDRESS]"
+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)