diff --git a/Gemfile b/Gemfile
index 9b7fd18..2bcdb94 100644
--- a/Gemfile
+++ b/Gemfile
@@ -173,6 +173,9 @@ gem "underscore-rails", "~> 1.4.4"
 # Sanitize user input
 gem "sanitize", '~> 2.0'
 
+# The newer revision of charlock_holmes that is finally fixed to be compatible with Gentoo
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
+
 # Protect against bruteforcing
 gem "rack-attack", '~> 4.3.0'
 
@@ -182,9 +185,6 @@ gem 'ace-rails-ap'
 # Keyboard shortcuts
 gem 'mousetrap-rails'
 
-# Detect and convert string character encoding
-gem 'charlock_holmes'
-
 gem "sass-rails", '~> 4.0.5'
 gem "coffee-rails"
 gem "uglifier"
diff --git a/Gemfile.lock b/Gemfile.lock
index 6e57107..5656ef9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/brianmario/charlock_holmes.git
+  revision: dde194609b3513b0d2369ce8f916ae52566154b4
+  ref: dde194609b3513b0d2369ce8f916ae52566154b4
+  specs:
+    charlock_holmes (0.6.9.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -97,7 +104,6 @@ GEM
       json (>= 1.7)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    charlock_holmes (0.6.9.4)
     cliver (0.3.2)
     coderay (1.1.0)
     coercible (1.0.0)
@@ -756,7 +762,7 @@ DEPENDENCIES
   capybara (~> 2.4.0)
   capybara-screenshot (~> 1.0.0)
   carrierwave
-  charlock_holmes
+  charlock_holmes!
   coffee-rails
   colored
   coveralls (~> 0.8.2)