diff --git a/Gemfile b/Gemfile
index 41d8619db0bcc25ca3f694098970b20a53a164d4..03afef29d70e4232826779c2d86b6df4036ca5f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'omniauth-twitter'
 gem 'omniauth-github'
 
 # GITLAB patched libs
-gem "grit",          git: "https://github.com/gitlabhq/grit.git",           ref: '9e98418ce2d654485b967003726aa2706a10060b'
+gem "gitlab-grit", '~> 1.0.0', require: 'grit'
 gem 'grack',         git: "https://github.com/gitlabhq/grack.git",          ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
 gem 'grit_ext',      git: "https://github.com/gitlabhq/grit_ext.git",       ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 466a373ad0fc95b83516d4457c6d68610a6b3b97..47cb5a464080e6796a962b65c00f22634d68c06b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,16 +14,6 @@ GIT
     grack (1.0.0)
       rack (~> 1.4.1)
 
-GIT
-  remote: https://github.com/gitlabhq/grit.git
-  revision: 9e98418ce2d654485b967003726aa2706a10060b
-  ref: 9e98418ce2d654485b967003726aa2706a10060b
-  specs:
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-
 GIT
   remote: https://github.com/gitlabhq/grit_ext.git
   revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907
@@ -175,6 +165,10 @@ GEM
       mime-types (~> 1.19)
       pygments.rb (>= 0.2.13)
     github-markup (0.7.5)
+    gitlab-grit (1.0.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
     gitlab_meta (5.0)
     gitlab_omniauth-ldap (1.0.2)
       net-ldap (~> 0.2.2)
@@ -486,6 +480,7 @@ DEPENDENCIES
   git
   github-linguist (~> 2.3.4)
   github-markup (~> 0.7.4)
+  gitlab-grit (~> 1.0.0)
   gitlab_meta (= 5.0)
   gitlab_omniauth-ldap (= 1.0.2)
   gitlab_yaml_db (= 1.0.0)
@@ -493,7 +488,6 @@ DEPENDENCIES
   grack!
   grape (~> 0.3.1)
   grape-entity (~> 0.2.0)
-  grit!
   grit_ext!
   growl
   guard-rspec