--- a/Gemfile
+++ b/Gemfile
@@ -137,13 +137,16 @@
 # Sanitize user input
 gem "sanitize"
 
+# 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"
 
 gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"
-gem "therubyracer"
 gem 'turbolinks'
 gem 'jquery-turbolinks'
 
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,11 @@
 GIT
+  remote: https://github.com/brianmario/charlock_holmes.git
+  revision: dde194609b3513b0d2369ce8f916ae52566154b4
+  ref: dde194609b3513b0d2369ce8f916ae52566154b4
+  specs:
+    charlock_holmes (0.6.9.4)
+
+GIT
   remote: https://github.com/gitlabhq/markup.git
   revision: 61ade389c1e1c159359338f570d18464a44ddbc4
   ref: 61ade389c1e1c159359338f570d18464a44ddbc4
@@ -70,7 +77,6 @@
       json (>= 1.7)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    charlock_holmes (0.6.9.4)
     cliver (0.2.2)
     code_analyzer (0.4.3)
       sexp_processor
@@ -267,7 +273,6 @@
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
-    libv8 (3.16.14.3)
     listen (2.3.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -401,7 +406,6 @@
       redis-store (~> 1.1.0)
     redis-store (1.1.4)
       redis (>= 2.2)
-    ref (1.0.5)
     require_all (1.3.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -488,9 +492,6 @@
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     test_after_commit (0.2.2)
-    therubyracer (0.12.0)
-      libv8 (~> 3.16.14.0)
-      ref
     thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
@@ -561,6 +562,7 @@
   bootstrap-sass (~> 3.0)
   capybara
   carrierwave
+  charlock_holmes!
   coffee-rails
   colored
   coveralls
@@ -644,7 +646,6 @@
   stamp
   state_machine
   test_after_commit
-  therubyracer
   thin
   tinder (~> 1.9.2)
   turbolinks