diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index d425780..7c1962a 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -25,7 +25,7 @@ EBUILD gitlabhq-7.10.3.ebuild 11280 SHA256 b68816f36f41d7c2771448db041b56c9c12d8
 EBUILD gitlabhq-7.10.4.ebuild 11291 SHA256 d9958266f80306ae1961e00f50fd211d3d1b9496686301c1d145ecfcde7b03b1 SHA512 516d140f375ff5b915332555f06d805e4455eebab0cfa33dac2c0e8e1460c9f9611573d5f0604e75416f6ee376870123f3f3c4fc7405badc86a1ecbcfe5c4150 WHIRLPOOL ae0281c20bf798cc09ebd52e9e60393e36aee1be5ec10c26ec6bce2cf7a811477fcb67baf99815ef755521b25d24678bf24a42d569fac31daaa29bf6f85911a0
 EBUILD gitlabhq-7.11.1.ebuild 11337 SHA256 c2fae88e4a2ffc3aa16e4feaa56ad5e3ed7aaf891707db49296f77585dde5c56 SHA512 2cd81ec23f75846cc984961edc707ffa4aa837e7e0ca0aafac48e24616f5661aebc0912c5c191485465cc6a5c92edde6eda1b0ff7d79eaaf3688df1a4150cdca WHIRLPOOL c0c95e58f21d5496bc37654a67626eeb1fc7c660f14431fbf948dd2bb71a5fab409c69688dd44456fdc78d0456b24be978f732809305631e10b253a544586561
 EBUILD gitlabhq-7.11.4.ebuild 11337 SHA256 c2fae88e4a2ffc3aa16e4feaa56ad5e3ed7aaf891707db49296f77585dde5c56 SHA512 2cd81ec23f75846cc984961edc707ffa4aa837e7e0ca0aafac48e24616f5661aebc0912c5c191485465cc6a5c92edde6eda1b0ff7d79eaaf3688df1a4150cdca WHIRLPOOL c0c95e58f21d5496bc37654a67626eeb1fc7c660f14431fbf948dd2bb71a5fab409c69688dd44456fdc78d0456b24be978f732809305631e10b253a544586561
-EBUILD gitlabhq-7.12.0.ebuild 10919 SHA256 fa98601a4251830318fa9b4b2513cc02459db8e5ee04bac7bfb6326ce37f69bc SHA512 1661135126472f1ae209be8d930c4ab870bc14a297c690e3feb02e3561ab28cdbcabf61f4b377f11a5c8166fb7e88ede505ce8fa8f94fcaacecb9e52a8296799 WHIRLPOOL 3c1878de816e92a5aa3dbdabb9ab2f0a84a8c32a596ea4a7a4aee2e1f497ea1a5cf2c8c91ec691229323a56a0d3f2a7d03cf4f9868746686ea3f0b82a75c5e81
+EBUILD gitlabhq-7.12.0.ebuild 10965 SHA256 845a6d939b0c9d3e31af6f150ec81e57b931ad57d4c9da2454ea2b32e38ec8e6 SHA512 245cb32d36b5bb8fc541534e82ce17d34a9634ebc252eed505e74e400c6a427067c46e21ac757a7044b25f8b620095cc36e536d5c366815227c12d7a06709745 WHIRLPOOL edfc96c30d177f55841e1502304c66d0a2faae8d94e3e8c2786af4d1ef5626e0f2a0b73a632cec461bec07712c0ade6dc9295a5ee0e042b77a602cbad34f3c95
 EBUILD gitlabhq-7.8.1.ebuild 10966 SHA256 b5d3b822a4ce401b50909f0663bef4dacf7c9673c51bbbe2f600533f3bf7c365 SHA512 630b0b2bcda6fb7c5b407b4c094e35ad9de74ea9e6fd959f914f9944cd543ced2c3f9b1e8d3f98c6d3f1e0a3f6873e4ca64817ae3fe2aed61c4e656995e8ef62 WHIRLPOOL 3cede9b536a86cce0cc024a957d7b29c472cf60223ba9321bbe9e4b885cb9a58c3438d07708280a76dafb811551c3576559c4e6ec71b2050c3e81e88f460bce4
 EBUILD gitlabhq-7.8.4.ebuild 11421 SHA256 bb3de388ee40f9d63789c65da6d331f543870e88371c65a1f56ad019bf13d07f SHA512 600e93ceb3b4dbf018197e1462e14501bb6a36e1febead7078743034137e442d9104e505a4de622a6ca6108ef0f2427f4feb08bd2dddf95cae3830b2aa744984 WHIRLPOOL 2d30fe945665abe83ca138a49b18eb808d555b9a1f00e61c197cc3bfbc3167a1b46359e639893628f0dcb2bad871571ba416982685602c5a9195240986083906
 EBUILD gitlabhq-7.9.3.ebuild 11316 SHA256 491ab8495fe600a625a03826d5f4f0a70cd54781c69b35de4eefaa7d4bbca5d0 SHA512 c80a1a04c3090603bd2f795624a97ed9e69451d4027321ffa7291b252a643a7cc14b50303b5fec0968b79101b3d3c304ff9d3731dd897cfb2e7a0d7fc4ed177f WHIRLPOOL 84dba3eb8abc110fb88b71db1cf4ed1f1085109c6af330094e50a7eedd18ce4721a5157745978a2705a93d1b21d53d57a80acf85a121926259d723235dcce416
diff --git a/www-apps/gitlabhq/gitlabhq-7.12.0.ebuild b/www-apps/gitlabhq/gitlabhq-7.12.0.ebuild
index c30284a..87264e3 100644
--- a/www-apps/gitlabhq/gitlabhq-7.12.0.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.12.0.ebuild
@@ -27,7 +27,7 @@ RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="mysql +postgres +unicorn systemd"
+IUSE="kerberos mysql +postgres +unicorn systemd"
 
 ## Gems dependencies:
 #   charlock_holmes		dev-libs/icu
@@ -48,12 +48,12 @@ GEMS_DEPEND="
 	net-libs/nodejs
 	postgres? ( dev-db/postgresql )
 	mysql? ( virtual/mysql )
-	virtual/krb5
+	kerberos? ( virtual/krb5 )
 	virtual/pkgconfig"
 DEPEND="${GEMS_DEPEND}
 	>=dev-vcs/gitlab-shell-2.6.3
 	dev-vcs/git
-	!app-crypt/heimdal"
+	kerberos? ( !app-crypt/heimdal )"
 RDEPEND="${DEPEND}
 	dev-db/redis
 	virtual/mta
@@ -186,7 +186,7 @@ all_ruby_install() {
 	cd "${D}/${dest}"
 
 	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn; do
+	local flag; for flag in mysql postgres unicorn kerberos; do
 		without+="$(use $flag || echo ' '$flag)"
 	done
 	local bundle_args="--deployment ${without:+--without ${without}}"