diff --git a/Gemfile b/Gemfile
index 295b25dca..2b0049dad 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'bundler', '>= 1.3.4'
+
 gem 'rails', '3.2.13'
 
 # Appserver
diff --git a/Gemfile.lock b/Gemfile.lock
index 064a0ccb7..64d64221d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -418,6 +418,7 @@ DEPENDENCIES
   addressable (= 2.3.3)
   asset_sync (= 0.5.4)
   bootstrap-sass (= 2.2.2.0)
+  bundler (>= 1.3.4)
   capistrano (= 2.12.0)
   capistrano_colors (= 0.5.5)
   capybara (= 1.1.3)
diff --git a/script/ci/before_install.sh b/script/ci/before_install.sh
index c5236b071..0a17b2758 100755
--- a/script/ci/before_install.sh
+++ b/script/ci/before_install.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Travis CI still includes 1.2.x by default
+gem install bundler --version '>= 1.3.4'
+
 # Ensure known RubyGems version
 envdir="$(readlink -e $(dirname $0))/../env"
 . "$envdir/ruby_env"
diff --git a/script/env/ruby_env b/script/env/ruby_env
index 0304e4da0..901910038 100644
--- a/script/env/ruby_env
+++ b/script/env/ruby_env
@@ -1,3 +1,3 @@
-rubygems_version="1.8.25"
+rubygems_version="2.0.3"
 ruby_version="1.9.3-p385"
 gemset="diaspora"