diff --git a/.gitignore b/.gitignore
index 935e70502..e9460ec24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ pkg/*
 Vagrantfile
 .vagrant
 .bundle
-*.lock
 cookbooks/*
 _site/*
 !templates/*
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..b6e7d5692
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,45 @@
+GIT
+  remote: git://github.com/mitchellh/virtualbox.git
+  revision: 69db76b
+  specs:
+    virtualbox (0.7.5)
+      ffi (>= 0.6.3)
+
+PATH
+  remote: .
+  specs:
+    vagrant (0.5.3.dev)
+      archive-tar-minitar (= 0.5.2)
+      json (>= 1.4.3)
+      mario (~> 0.0.6)
+      net-scp (>= 1.0.2)
+      net-ssh (>= 2.0.19)
+      virtualbox (~> 0.7.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    contest (0.1.2)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    json (1.4.6)
+    mario (0.0.6)
+    mocha (0.9.8)
+      rake
+    net-scp (1.0.2)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.0.23)
+    rake (0.8.7)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  contest (>= 0.1.2)
+  mocha
+  rake
+  vagrant!
+  virtualbox!
+  yard
diff --git a/Rakefile b/Rakefile
index e0c0c6e5d..644ad39c5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,35 +1,10 @@
+require 'rubygems'
+require 'bundler/setup'
 require 'rake/testtask'
+Bundler::GemHelper.install_tasks
 
 task :default => :test
 
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path('../vagrant.gemspec', __FILE__)
-    eval(File.read(file), binding, file)
-  end
-end
-
-begin
-  require 'rake/gempackagetask'
-rescue LoadError
-  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
-else
-  Rake::GemPackageTask.new(gemspec) do |pkg|
-    pkg.gem_spec = gemspec
-  end
-  task :gem => :gemspec
-end
-
-desc "install the gem locally"
-task :install => :package do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version} --no-ri --no-rdoc}
-end
-
-desc "validate the gemspec"
-task :gemspec do
-  gemspec.validate
-end
-
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.pattern = 'test/**/*_test.rb'