diff --git a/Gemfile b/Gemfile
index 295b25dca53740826bfd99fec24fabcfbaa5b7d9..2b0049dad98c12e2be248c7fa9ed829ce16f1e0b 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 064a0ccb702c386303b3af87024f243a7bff6ac2..64d64221d8e4f8ec6e25180d95ac6c4d282f4b5e 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 c5236b071b2bb301b2b71fc30a65c00c66eaa32c..0a17b27580b7798318586a0e2ea58293f5675b73 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 0304e4da085ba6eb6633ee91bf4f51f70917a129..901910038990788cd3256e241f31b06377683a95 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"