diff --git a/.gitignore b/.gitignore
index 36b842008..495dfe4c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 .DS_Store
+.bundle
 coverage
 rdoc
 gems
-bin
 pkg
 spec/fixtures/emails/failed_emails/
 mail.tmproj
diff --git a/Gemfile b/Gemfile
index 0f066bdee..6ee0f787c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source :gemcutter
+source 'http://rubygems.org'
 
 gem "tlsmail" if RUBY_VERSION <= '1.8.6'
 gem 'activesupport', ">= 2.3.4"
@@ -7,7 +7,7 @@ gem "mime-types"
 group :test do
   gem "rcov"
   gem "rake"
-  gem "bundler"
+  gem "bundler", "~> 0.9.10"
   gem "cucumber"
   gem "rspec"
   gem "diff-lcs"
diff --git a/Rakefile b/Rakefile
index 1f0d5d074..3340690a8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,10 @@
-environment = File.expand_path('../vendor/gems/environment', __FILE__)
-if File.exist?("#{environment}.rb")
-  require environment
-end
+require File.expand_path('../spec/environment', __FILE__)
 
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'cucumber/rake/task'
-require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
@@ -31,7 +27,7 @@ spec = Gem::Specification.new do |s|
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.gem_spec = spec
+  pkg.gem_spec = spec
 end
 
 task :default => :spec
diff --git a/spec/environment.rb b/spec/environment.rb
new file mode 100644
index 000000000..bf6396499
--- /dev/null
+++ b/spec/environment.rb
@@ -0,0 +1,9 @@
+begin
+  require File.expand_path('../../.bundle/environment', __FILE__)
+rescue LoadError
+  require 'rubygems'
+  require 'bundler'
+  Bundler.setup
+end
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)