diff --git a/Gemfile b/Gemfile
index c41b33f99..66db21884 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,8 +40,6 @@ gem 'seed-fu-discourse', require: 'seed-fu'
 
 if rails4?
   gem 'rails'
-  # because of https://github.com/redis-store/redis-store/pull/183
-  gem 'redis-rails', :git => 'https://github.com/SamSaffron/redis-store.git'
   gem 'rails-observers'
   gem 'actionpack-action_caching'
 else
@@ -52,11 +50,11 @@ else
   # we are using a custom sprockets repo to work around: https://github.com/rails/rails/issues/8099#issuecomment-16137638
   # REVIEW EVERY RELEASE
   gem 'sprockets', git: 'https://github.com/SamSaffron/sprockets.git', branch: 'rails-compat'
-  gem 'redis-rails'
   gem 'activerecord-postgres-hstore'
   gem 'active_attr'
 end
 
+gem 'redis-rails'
 gem 'hiredis'
 gem 'redis', :require => ["redis", "redis/connection/hiredis"]
 
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 96f8fd2d5..6bba6ab77 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -6,15 +6,6 @@ GIT
       rails (>= 3.0.0, < 5)
       spork (>= 1.0rc0)
 
-GIT
-  remote: https://github.com/SamSaffron/redis-store.git
-  revision: 1eafaa3d8bfbcb61ad89d1a2831adbba4ea8e1e1
-  specs:
-    redis-rails (3.2.3)
-      redis-actionpack (>= 3.2.3)
-      redis-activesupport (>= 3.2.3)
-      redis-store (~> 1.1.0)
-
 PATH
   remote: vendor/gems/discourse_plugin
   specs:
@@ -302,6 +293,10 @@ GEM
     redis-rack (1.5.0)
       rack (~> 1.5)
       redis-store (~> 1.1.0)
+    redis-rails (4.0.0)
+      redis-actionpack (~> 4)
+      redis-activesupport (~> 4)
+      redis-store (~> 1.1.0)
     redis-store (1.1.4)
       redis (>= 2.2)
     ref (1.0.5)
@@ -477,7 +472,7 @@ DEPENDENCIES
   rbtrace
   redcarpet
   redis
-  redis-rails!
+  redis-rails
   rest-client
   rinku
   rspec-given