diff --git a/Gemfile b/Gemfile
index a6c0c3da67..bbd179d196 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,7 @@ gem 'seed-fu' , github: 'SamSaffron/seed-fu'
 
 if rails4?
   gem 'rails'
+  # because of https://github.com/redis-store/redis-store/pull/183
   gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
   gem 'rails-observers'
   gem 'actionpack-action_caching'
@@ -80,8 +81,7 @@ gem 'sidetiq', '>= 0.3.6'
 gem 'eventmachine'
 gem 'fast_xs'
 
-# https://github.com/CodeMonkeySteve/fast_xor/issues/6
-gem 'fast_xor', git: 'https://github.com/CodeMonkeySteve/fast_xor.git'
+gem 'fast_xor'
 gem 'fastimage'
 gem 'fog', '1.18.0', require: false
 gem 'unf', require: false
diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index 97ed503c0f..28f93ad9a3 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -23,14 +23,6 @@ GIT
       rails (>= 3.0.0, < 5)
       spork (>= 1.0rc0)
 
-GIT
-  remote: https://github.com/CodeMonkeySteve/fast_xor.git
-  revision: 85b79ec6d116f9680f23bd2c5c8c2c2039d477d8
-  specs:
-    fast_xor (1.1.2)
-      rake
-      rake-compiler
-
 GIT
   remote: https://github.com/SamSaffron/vestal_versions
   revision: 007b30a5274db7db55da745a4482243559247782
@@ -158,6 +150,9 @@ GEM
     fast_stack (0.1.0)
       rake
       rake-compiler
+    fast_xor (1.1.2)
+      rake
+      rake-compiler
     fast_xs (0.8.0)
     fastimage (1.5.2)
     ffi (1.9.3)
@@ -460,7 +455,7 @@ DEPENDENCIES
   fabrication
   fakeweb (~> 1.3.0)
   fast_blank
-  fast_xor!
+  fast_xor
   fast_xs
   fastimage
   flamegraph