diff --git a/Gemfile b/Gemfile
index 2f9e1eb897..d7e770e9ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,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', github: 'rails/turbolinks', branch: 'master'
+gem 'turbolinks'
 gem 'arel', github: 'rails/arel', branch: 'master'
 gem 'mail', github: 'mikel/mail', branch: 'master'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ab4183f916..0b8ac70d48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,14 +70,6 @@ GIT
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
 
-GIT
-  remote: git://github.com/rails/turbolinks.git
-  revision: ad583843fdaa0c1f61462a346a495981ca314460
-  branch: master
-  specs:
-    turbolinks (3.0.0)
-      coffee-rails
-
 GIT
   remote: git://github.com/sass/sass.git
   revision: bce9509f396225d721501ea1070a6871b708abb1
@@ -319,6 +311,8 @@ GEM
     thread_safe (0.3.5)
     timers (4.1.1)
       hitimes
+    turbolinks (2.5.3)
+      coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2015.7)
@@ -389,7 +383,7 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
   stackprof
   sucker_punch
-  turbolinks!
+  turbolinks
   tzinfo-data
   uglifier (>= 1.3.0)
   w3c_validators