diff --git a/Vagrantfile b/Vagrantfile
index 1d0442d62..04ab735bd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -20,6 +20,7 @@ sudo mkdir -p ${GOPATH}
 cat <<EOF >/tmp/gopath.sh
 export GOROOT="${GOROOT}"
 export GOPATH="${GOPATH}"
+export GO15VENDOREXPERIMENT="1"  # Not needed for Go 1.6 and up
 export PATH="${GOROOT}/bin:${GOPATH}/bin:\$PATH"
 EOF
 sudo mv /tmp/gopath.sh /etc/profile.d/gopath.sh
@@ -31,6 +32,8 @@ sudo chown -R vagrant:vagrant ${GOPATH}
 # Install some other stuff we need
 sudo apt-get update
 sudo apt-get install -y curl make git mercurial bzr zip
+
+go get github.com/mitchellh/packer
 SCRIPT
 
 Vagrant.configure(2) do |config|