diff --git a/Gemfile b/Gemfile
index 655a84e..2011a9c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ unless ENV['USER'] == 'vagrant'
   exit 1
 end
 
+gem 'vagrant', github: 'mitchellh/vagrant'
 gem 'rake'
 gem 'net-ssh'
 gem 'rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 08135b1..6f610d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,24 @@
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: 803269f7291719715011c5c76d66e20101f7af50
+  specs:
+    vagrant (1.1.0.dev)
+      childprocess (~> 0.3.7)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      json (~> 1.6.6)
+      log4r (~> 1.1.9)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.2.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.0.8)
-    diff-lcs (1.1.3)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
+    diff-lcs (1.2.1)
+    erubis (2.7.0)
     ffi (1.4.0)
     guard (1.6.2)
       listen (>= 0.6.0)
@@ -10,29 +26,33 @@ GEM
       pry (>= 0.9.10)
       terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (2.4.0)
+    guard-rspec (2.4.1)
       guard (>= 1.1)
       rspec (~> 2.11)
-    listen (0.7.2)
+    i18n (0.6.1)
+    json (1.6.8)
+    listen (0.7.3)
     log4r (1.1.10)
     lumberjack (1.0.2)
     method_source (0.8.1)
-    net-ssh (2.6.5)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.2.2)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.0.3)
-    rb-inotify (0.8.8)
+    rb-inotify (0.9.0)
       ffi (>= 0.5.0)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     slop (3.4.3)
     terminal-table (1.4.5)
     thor (0.17.0)
@@ -48,3 +68,4 @@ DEPENDENCIES
   rake
   rb-inotify
   rspec
+  vagrant!
diff --git a/setup-vagrant-dev-box b/setup-vagrant-dev-box
index 7367e7f..aac4531 100755
--- a/setup-vagrant-dev-box
+++ b/setup-vagrant-dev-box
@@ -93,7 +93,8 @@ vagrant_ssh 'sudo chown vagrant:vagrant /etc/rinetd.conf'
 vagrant_ssh 'cd /vagrant && bundle'
 
 # Setup vagrant default ssh key
-vagrant_ssh "cp /vagrant/vagrant-1.1/keys/vagrant ~/.ssh/id_rsa && cp /vagrant/vagrant-1.1/keys/vagrant.pub ~/.ssh/id_rsa.pub && chmod 600 ~/.ssh/id_rsa"
+vagrant_keys_path = '$(cd /vagrant && bundle show vagrant)/keys'
+vagrant_ssh "cp #{vagrant_keys_path}/vagrant ~/.ssh/id_rsa && cp #{vagrant_keys_path}/vagrant.pub ~/.ssh/id_rsa.pub && chmod 600 ~/.ssh/id_rsa"
 
 # Setup lxc cache
 vagrant_ssh "sudo mkdir -p /var/cache/lxc/cloud-quantal && sudo cp /vagrant/cache/#{IMAGE_NAME} /var/cache/lxc/cloud-quantal/#{IMAGE_NAME}"
diff --git a/vagrant-1.1 b/vagrant-1.1
deleted file mode 160000
index 803269f..0000000
--- a/vagrant-1.1
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 803269f7291719715011c5c76d66e20101f7af50