diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000000000..632c37e04
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source :gemcutter
+
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000000000..ba68867b7
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    configuration (1.1.0)
+    culerity (0.2.10)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    json_pure (1.4.3)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    mime-types (1.16)
+    nokogiri (1.4.2)
+    rack (1.2.1)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rspec (1.3.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.26)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
+    sinatra (1.0)
+      rack (>= 1.0)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara!
+  culerity (>= 0.2.4)
+  launchy (>= 0.3.5)
+  mime-types (>= 1.16)
+  nokogiri (>= 1.3.3)
+  rack (>= 1.0.0)
+  rack-test (>= 0.5.4)
+  rspec (>= 1.2.9)
+  selenium-webdriver (>= 0.0.3)
+  sinatra (>= 0.9.4)
+  yard (>= 0.5.8)
diff --git a/README.rdoc b/README.rdoc
index c3e6bf65f..97728b8a1 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -34,6 +34,11 @@ Pull requests are very welcome! Make sure your patches are well tested, Capybara
 a testing tool after all. Please create a topic branch for every separate change
 you make.
 
+Capybara uses bundler in development. To set up a development environment, simply do:
+
+    gem install bundler --pre
+    bundle install
+
 == Using Capybara with Cucumber
 
 Capybara is built to work nicely with Cucumber. The API is very similar to
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 60ee46914..163d3006a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,8 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
+require "bundler/setup"
+
 require 'spec'
 require 'spec/autorun'
 require 'capybara'