diff --git a/.gitignore b/.gitignore
index d87d4be..97e0ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,5 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.yardoc/
+/coverage/
+/doc/
+/pkg/
+/rdoc/
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..32692ce
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,30 @@
+PATH
+  remote: .
+  specs:
+    yawpa (1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.4)
+    json (1.8.1)
+    rake (10.3.2)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rdoc
+  rspec
+  yawpa!
diff --git a/Rakefile b/Rakefile
index 709177f..a5d8832 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,9 @@
+require "bundler"
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  raise LoadError.new("Unable to setup Bundler; you might need to `bundle install`: #{e.message}")
+end
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require "rdoc/task"
diff --git a/yawpa.gemspec b/yawpa.gemspec
index 5a85671..b1a6aef 100644
--- a/yawpa.gemspec
+++ b/yawpa.gemspec
@@ -15,5 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Yawpa::VERSION
 
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rdoc"
 end