diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index 9bce0b8..67f10b1 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -1,5 +1,6 @@
 AUX gitlab-ce-7.13.1-fix-gemfile.patch 1478 SHA256 99050e17841670f03e9430e1f0409cb0194b49ef3235b90c13a4bd66a2648ad6 SHA512 9b0ef71867d4049970295f1ac015e3a4917a24c61edab3452f75f9652e21b94f3dd859247bb28622cd032fe33d4ebcec7b262488841540b48e387f11399c9a8b WHIRLPOOL 9db14e3339e1038dbaff9344f3472c6e23209fa6edbeca35c3108723fd39cb93420361ffdade21fc7019a1e873283524db6e38868ee247ca11a5814832083aa0
 AUX gitlab-ce-8.0.2-fix-gemfile.patch 1586 SHA256 c91945e0e639b1297519d7165a3aa03fe203a29cde1d195f277be6cba71c67e1 SHA512 6eb15935292902b3090e856e00a972ee2e442eadbf2e42fbde1e4727d75d65e0e06c6be54be8fcd7aeebb5e0616c8d5123f60ebabebd7e02531f0fbc7b03d760 WHIRLPOOL 985e86c5bcb1ea059b41f1f08d3528afd3ab31d71eb81df79a2b454a0e2fb24dbf08b4a1c9197e56864550842baa60599db631bbd2a3603caaea9b7d6743e3d1
+AUX gitlab-ce-9999-fix-gemfile.patch 1585 SHA256 5e5a17fe241547f79e9992a43dc87c2be09ef5021072002c5172f9bc84858ab6 SHA512 f7de8760a1da1d8829b8b481fe0dafe0c379476406d2e0eac92b3085d4a95bbaa75124e592e724dd78add6cc603c3622ddffed6a337ac93ed510ec96045d7345 WHIRLPOOL 3dde3a4aad28d70cfcc3f379e6c3e29aa86fb508e18e01722877cb1d842ee8580d1a74ed6d2325f8790e27e38bb7b5ffc50adc265337e1557156c9806314a750
 AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
 AUX gitlab-git-http.service 972 SHA256 752e1b62a6c182d69b097788d4c21672655af92f150aa5ee416efab67c869f28 SHA512 ba6feefd2741fe97c176e00fbbb802fb4bfc9fc71b2d584c3ad44a312f2b01c9fe92d268d26ab18cb9372ad8616a5ca1554f2895297a17d35f6818bd27b8244b WHIRLPOOL c7c7fa598f2bae6f736a5f84aa3e737dd3b3bce8803128b0b17a8375e4e0c528b95bcd88b959c5bb9bd5ca1fd73330170be6fe2680c1a14702073d3c1c15f265
 AUX gitlab-sidekiq-8.init 995 SHA256 179f8f9267f8358827c4c70697bf27dac728451ac7b9dbe0637d397850260fc2 SHA512 fca6c3b86788113f50120ada81859535bcdd3524ebf79e495c532049a5e1cb09b44499268b22610707ea4763bd6b380fe8abfad10520cd17b03802264c34f0bc WHIRLPOOL edc9c083447662bebdde5b0bbb97816f15a3122aa5cae966d1df805aac5a81e51a608cb5447283bda222af3bd28519b653a6ca6b34d1eef84abc37fd719e5955
@@ -20,5 +21,5 @@ EBUILD gitlab-ce-8.0.3.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c27
 EBUILD gitlab-ce-8.0.4-r1.ebuild 11221 SHA256 af33dfb570403c56fc940e8f8eb74ef7def9f8ef52d74ae313a79498fe4fcc30 SHA512 38f6cb2b4cb309ddcec73373f41b456a3175c2a5112a818d6bce5c7f1e7e0982adfb53c67d24a6f38f562f6ed247b51a4a9b567ef3a5450d6a47c5011afc104f WHIRLPOOL b6177fde2402cd5525a2f7daa72ada600054bc2816acbf05b4b9d25176d04388bb8ca89ca793d55e52103b0ae38fa9d35024fb3448c115997e45526c09eee5ac
 EBUILD gitlab-ce-8.0.4.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c275ca0a46fe1fb5ac02e64aa923d7 SHA512 167cdf0189e1654f40db128f460286e20af2f55baa566b13ef97ba0c9bb2e2fc0edf694468e18320306e3e85d14831e11def094f0d9eff4e3c28e50a8dd3c508 WHIRLPOOL 1179dc8bd4e092156d46e9d489777ad71da803da760100526908e80e17b66004832f77ac287aa610e05047d7702f2c1ccf2803ce4b360f88340358415e1f7e79
 EBUILD gitlab-ce-8.0.5.ebuild 11208 SHA256 41cc56507cf3ecc386f397738c4ebe5cac13b6f1e099e00985b9a7959ee08586 SHA512 ffb6c749309c35aae8e04ad553815d9dda324da4d6bc9678e08936f255601658d3977235a815fbea12bcb9c269be98a807f22f32d4bae9e85a2d500f6b771982 WHIRLPOOL 2c7964e82bad883e0ce7f08eea6dc9d84c63a6b5b9a76b412dab78ce1726992812c6376bf02541c02728817a42c71167869595fb73370e914b303faad1ab1568
-EBUILD gitlab-ce-9999.ebuild 11087 SHA256 565d2f2a530d232bed74ab7c9699788e186d69159e5b201a2b9e9990f558083d SHA512 c8eb9b1a667e78404949835ef92d8ca9ef74738379a0b2de9d64ce3dc0510635f575d43fc13efc52076afd8b85a3955e8614a41503e6ca1deb0847d1f23c2ad2 WHIRLPOOL a9889adc7f162bfc032914252f4f689e417e06b06149695f2f370daa7806bc33ccba6a2767f79d512cd9cc7dcbd8ffbfbdb2a71ec40cb16c2dfbec4900804dc6
+EBUILD gitlab-ce-9999.ebuild 11080 SHA256 f20e17e6f5edc646d6773dea7d303007c4461a9aad82e58e7db0a0d17675037e SHA512 4272e495637acca385055c8aa5b685d6e35fd1b560bb4cf2385dc87a71236150ac567da3a601ff85aad1c7f949096c4bada2493027e1cec44127b84da92bdd8b WHIRLPOOL a9b4d67c55968e2755b04ed55d56e212a81ccdfc676b764ca328c7ee56f5309cb2ffeeff01a42cde617da51e6b0d691efcfc33102953be489a093e2a612e22ff
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1
diff --git a/www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch b/www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch
new file mode 100644
index 0000000..58f345b
--- /dev/null
+++ b/www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch
@@ -0,0 +1,56 @@
+diff --git a/Gemfile b/Gemfile
+index 9254ce2..94acb3d 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -174,6 +174,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'
+ 
+@@ -183,9 +186,6 @@ gem 'ace-rails-ap', '~> 2.0.1'
+ # Keyboard shortcuts
+ gem 'mousetrap-rails', '~> 1.4.6'
+ 
+-# Detect and convert string character encoding
+-gem 'charlock_holmes', '~> 0.6.9.4'
+-
+ gem "sass-rails", '~> 4.0.5'
+ gem "coffee-rails", '~> 4.1.0'
+ gem "uglifier", '~> 2.7.2'
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 5312289..586bd90 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:
+@@ -108,7 +115,6 @@ GEM
+       json (>= 1.7)
+     celluloid (0.16.0)
+       timers (~> 4.0.0)
+-    charlock_holmes (0.6.9.4)
+     chunky_png (1.3.4)
+     cliver (0.3.2)
+     coderay (1.1.0)
+@@ -800,7 +806,7 @@ DEPENDENCIES
+   capybara (~> 2.4.0)
+   capybara-screenshot (~> 1.0.0)
+   carrierwave (~> 0.9.0)
+-  charlock_holmes (~> 0.6.9.4)
++  charlock_holmes!
+   coffee-rails (~> 4.1.0)
+   colored (~> 1.2)
+   colorize (~> 0.5.8)
diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
index 01539e6..866175c 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@@ -75,7 +75,7 @@ ruby_add_bdepend "
 #     Fix default settings to work with ssmtp that doesn't know '-t' argument.
 #
 RUBY_PATCHES=(
-	"${PN}-8.0.2-fix-gemfile.patch"
+	"${P}-fix-gemfile.patch"
 	"${PN}-fix-sendmail-config.patch"
 )