diff --git a/Gemfile b/Gemfile
index a9a326c0ff..8bb4c7d7a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'mocha', '~> 0.14', require: false
 gem 'rack-cache', '~> 1.2'
 gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
 gem 'coffee-rails', '~> 4.1.0'
-gem 'turbolinks'
+gem 'turbolinks', github: 'rails/turbolinks', branch: 'master'
 gem 'arel', github: 'rails/arel', branch: 'master'
 gem 'mail', github: 'mikel/mail', branch: 'master'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 16225777b6..6e62c395ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,6 +89,14 @@ GIT
     sprockets (4.0.0)
       rack (> 1, < 3)
 
+GIT
+  remote: git://github.com/rails/turbolinks.git
+  revision: 6d2ffc0e9eadb047ca5febbc08da8d92acab78c4
+  branch: master
+  specs:
+    turbolinks (3.0.0)
+      coffee-rails
+
 PATH
   remote: .
   specs:
@@ -273,8 +281,6 @@ GEM
     thread_safe (0.3.5)
     timers (4.0.4)
       hitimes
-    turbolinks (2.5.3)
-      coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2015.6)
@@ -341,7 +347,7 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
   stackprof
   sucker_punch
-  turbolinks
+  turbolinks!
   tzinfo-data
   uglifier (>= 1.3.0)
   w3c_validators