diff --git a/Gemfile b/Gemfile
index 4c977dde0a9..8394f7e9b8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ gem "gitolite",      :git => "https://github.com/gitlabhq/gitolite-client.git",
 gem "pygments.rb",   :git => "https://github.com/gitlabhq/pygments.rb.git",     :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git",   :ref => "7edf27d0281e09561838122982c16b7e62181f44"
 gem 'yaml_db',       :git => "https://github.com/gitlabhq/yaml_db.git"
+gem 'grack',         :git => "https://github.com/SaitoWu/grack.git"
 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
 
 gem "stamp"
diff --git a/Gemfile.lock b/Gemfile.lock
index d50a8d1e5d7..c077593ee1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/SaitoWu/grack.git
+  revision: dd990d231ac9189046b71a65d874638e55320e27
+  specs:
+    grack (1.0.0)
+      rack (~> 1.4.1)
+
 GIT
   remote: https://github.com/ctran/annotate_models.git
   revision: 18cd39ad01829deba5aa34634b8540d6675ab978
@@ -373,6 +380,7 @@ DEPENDENCIES
   foreman
   git
   gitolite!
+  grack!
   grit!
   haml-rails
   httparty