diff --git a/profiles/updates/3Q-2017 b/profiles/updates/3Q-2017
new file mode 100644
index 0000000..33016c7
--- /dev/null
+++ b/profiles/updates/3Q-2017
@@ -0,0 +1 @@
+move www-servers/gitaly www-servers/gitlab-gitaly
diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog
index 04069db..5157790 100644
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@@ -4,6 +4,11 @@
   -gitlab-ce-9.2.6.ebuild:
   www-apps/gitlab-ce:  Add ebuild for GitLab 9.2.7
 
+  08 Jul 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.10.ebuild,
+  gitlab-ce-9.1.7.ebuild, gitlab-ce-9.2.6.ebuild, gitlab-ce-9.3.0_rc2.ebuild,
+  gitlab-ce-9999.ebuild:
+  www-apps/gitlab-ce:  Follow rename of gitaly -> gitlab-gitaly
+
   17 Jun 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9999.ebuild:
   www-apps/gitlab-ce:  Update version 9999
 
diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index 710b8e6..da663f6 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -27,10 +27,10 @@ DIST gitlab-ce-9.3.0_rc2.tar.gz 31567867 SHA256 fbd93af8281b2460a9600a84b24b007e
 EBUILD gitlab-ce-8.15.8.ebuild 11986 SHA256 6c86e66d4b568b88dd44ec52401e25c33b2d5e61d9a76e77180320d40ef57132 SHA512 91e1dc1cd8b9b77ea039e7e194b06c44900511b9e7787a714faec14746f96da6d00aa66bd16763732c468d8a46815e29fe761349a0a0d712db21bd4a12d31e06 WHIRLPOOL 50923df1fdda85abf7c7984a49d73d6486628439612de18ec3914274f3a053ce98ffbffec0f6ca9f2f9ba1ca9491467de0762d2d4a31ea480f32eb68222c79f9
 EBUILD gitlab-ce-8.16.9.ebuild 11986 SHA256 21a0d7336a0a022db75ded6f29fe12d64012bd20a46e538ce0940a3c7e402a11 SHA512 c8e3ff6de9d97e25300315e967b7bcfc7d4aa5bc3e78aa45564e12bb673fbf79c9ba454174fe4f362d9d58575611debf797b52685b2061ac3053113390401a5c WHIRLPOOL 4644465cfcaf81184c62acf888ced3f16ccffc9de84fac7774a5463a778684c051580dd1f273546b9be8a0ace83243abc06e1e5ba042b18a10f7d352783a995f
 EBUILD gitlab-ce-8.17.6.ebuild 12932 SHA256 e5f7cc94653a6c55627264e02116d43febdcc58bd60ccf9f7c5fecf9476d1b0a SHA512 65fc18401842e1c1176d8178acff3ca48f1fe80ee8869b7263cd1819ced46bb8d1c2771226d9f7c9c5507ef120d69d66114605d8ed7b3923e5f9a61e2cc0125d WHIRLPOOL 3c979ba2e30fbb3c628063f71e3a8b12183632413f4342b81298e4fd4847e8a583adab16c202340d89fde010097f140005ae564c0d52fefb0fcb57b67ede398d
-EBUILD gitlab-ce-9.0.10.ebuild 13087 SHA256 28da4095f2a71224e5dc0d1edb358218f7a8712aee9b6255b831e4b5b9c3e6b3 SHA512 5e6d1a29714537cb2960caa289e8871cad695c6b509e5505efc4bc55d964d8a89f6f95a4355d2530d7f5eea2923e2cb5dd6023e59b084537c8594c54acadde48 WHIRLPOOL 348b3a87b1bd80e82fddda2d5c17072df67178eb52e2b3bd586ea2838b91cb5d8d30919cf306801f4d0dddd7246e2f917f519d2df4697c117012b46d528d7831
-EBUILD gitlab-ce-9.1.7.ebuild 13243 SHA256 70396c636ab5c0490c6641be0fece874d87afafb4d73c6032937b31e9cdca16c SHA512 3ad301c43b4500a1e75b9dc3f694c189d5426bb1a26f512e75e833d849e8d070b162c29425cda42e9cc074b5fe0ed007f5baa9a1c32c47dc478ec7333847c00e WHIRLPOOL f6483c776faefd60a8bd38a769fd326b1351ea9c1df65314baf314d0b4de21304fd618d29a28d8a75ee43977b97d3e6bc23f9d040fde626a20771e901d8f52fe
-EBUILD gitlab-ce-9.2.7.ebuild 12988 SHA256 6f20863941aa92b52beb0d44eaf2046efb4e0cc8206e7829dad755ceac7e1307 SHA512 f84d3688406b73379e46199b94f37b6d2910f4c979e6eee8fd5a89167307a3a622eb339402b7ecd804c71be414325f1a241a3302e6ede7191f600c948cce858f WHIRLPOOL ec8691b3c6385f5eba7a51ac10f44b26514083ecc150387ad114ab92babaf8680ef6a4768e49d134e5c9671b65635b3f7fd453dcc9541fbcf83ca357bb001e93
-EBUILD gitlab-ce-9.3.0_rc2.ebuild 12822 SHA256 9144b747ac6dc1c21545960749ef0931a8934704feac5cdb7a8b88f7ce264b50 SHA512 04bc05883a0666f68538e828568f199c2d760b29735131ce557b177738bc3235187cfce5a5553c7f989274d96577a40f3962d8d5ce519c2a05749be6c8a847fc WHIRLPOOL a47ee848d7796e8d186ee22984d7f6f7e41e3e546de3098c767019dd1314f62bba51d677a08b847b274184681c687b8391b5f0d8f05821cbd1544d16fffc9d6f
-EBUILD gitlab-ce-9999.ebuild 12782 SHA256 9d8d8407ecc36d9c1c25522856cb543bbd9e96991e207b2056f1c2b8ac0d219c SHA512 d50cfc62d4df3b38295e618f9c52115d7128771fc494684d1414cdf709db668a521929e2108aab0176a5611c5e15838b6dca333141da38763a9e823c52f5a8d8 WHIRLPOOL c84f158d8c8b0c8c6d4c13bb8f03a0d4708846a0b65db9f248bb64954c44007bbe4492f610f5fe5f859ca582e26614827dd81f9ec37791b8f735b373ad05d9b3
-MISC ChangeLog 18956 SHA256 a2104b894341fbca557ef241bf7c5d87e1463cafa0f8227879b78734c52a5e47 SHA512 c86deb3a84a003d95127ff7ad8813bddb716a8ea37d0acab2cd09af0fd9810bef0424c749fe06f0300d171d151731cd516b944254094254cc37de9f5712afd9f WHIRLPOOL 908396e9686a1c5a6cad588186a0d72908f3378c340629eb192a4e7fd8b7aff3911c492a085ef69203a10af0da0070c9431545caedd48f31cedabcf39f6ab012
+EBUILD gitlab-ce-9.0.10.ebuild 13094 SHA256 3095dbce78328f513eaf599486af63ae383635b305f24293a4cde3c3fe2ef55e SHA512 f8f500dcb2192c3b80423bf609bd1d0628471f75bdcd9e991489d0560ec34e1c0cc2362cdb6954014ac5e2e3ebed1d7f8df384cb655be73c50c6f54fa5ea62b9 WHIRLPOOL b0107dae53175d047b036fe98ea5b330fa521eb025a86f0dc011654e6aaaa7ee956c789de7a045854df72cddd96d558fadded069cf023111e6dfc7407490d469
+EBUILD gitlab-ce-9.1.7.ebuild 13250 SHA256 be342467f79215ec736c6d1f4d9d26bb679116f422585cceeac90bdf15dedfec SHA512 eca7584067d438b1feeeb56d7ef765af1f96f3fce8098d32e70e4f706c9572a52ffd7d4594c949234a1d25e9f52b220892d656afce4b30ca32ebe51665d0326c WHIRLPOOL 27d89d8d86c583da924bdac4f6db7216be151a55d5b14f7a78dd77417cd643c506c1c2ec652e234df7763472a0cad21794645dd85cfb404276179721649d4077
+EBUILD gitlab-ce-9.2.7.ebuild 12995 SHA256 93cb032967c0388d706be2dda0cfca2ca4765c0774e283ab0d61769cf43ddea6 SHA512 b8ecb0a4cc893786d4cd2dd94d53a21c6a8fbec5d181843286584914363f1160361dccfe2f61487f6744f7fb4d42a5efc4085e64bca7b29dea7e4672788c49cf WHIRLPOOL 2d8ada573da9e209e7a0bf3f05aef83e2419c18f4406b3abdbb24a90b488acdbdf7d4406b665a92356b457d100dd46c2a39084f87ba90b23da87392f2f98beb4
+EBUILD gitlab-ce-9.3.0_rc2.ebuild 12829 SHA256 6951949f8d98f867746a0128e99ce3baabddecdaa45952565f38a913b2868058 SHA512 3337e413db8680d0d177099425a71c2410afdec9130d57f9c910770aeb12dd7a13c410782f41f8a0cd24d243534d513b66ec4d93eb09c7e15896716863682eb0 WHIRLPOOL 6b9d03912224808065b3bc301f9ce7b82925293db2916cdeb3184b28c0d58fc034b06dda6b43109b251c942d3b4bebd0c4e6bde7c644630baaece585c35ae6d3
+EBUILD gitlab-ce-9999.ebuild 12789 SHA256 27db871b7d51cae37b6802043c82887bb810c1183682ce6c7efe0dc546d9b29e SHA512 99ca91ab0b8045d8bc2cd9d4208ecd4e8eb96c3d01afe49d119bb5677ee88f5f700042f502ab0c446f7acaaaeb7b9758c6d721a91f256eea335eb744a05a4b27 WHIRLPOOL a1e812d1d9562e7febee89e5c847ea0febec360aee38efc5cf779e45b92bb73eff3f066eb90fb96c292e8cfdc2a322bc9222a786796ac0470a221e44369a3270
+MISC ChangeLog 19200 SHA256 db9f337205efe14e3f1eaf70b0969c373f4c8c3373157147472a3c12ba9610cd SHA512 1aa815fb7827127f7f99d0e3b27d7be6334865a1313a5fc87ea13e7aec06447f24d9ba2b4ddab84eb200cb4ec06db49d0546956e49b2b051d5bd54b920a4ad63 WHIRLPOOL a6a9f04d0d930a515cb2c0a6ab594f94ed67b4ffef97bca09f282aea2c4663cbc05ad91a570dfbe0f88d3126759c9f810cb642dfa998b6204c3456ab9907e519
 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild
index e090a7f..c6a7337 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.0.10.ebuild
@@ -66,7 +66,7 @@ COMMON_DEPEND="
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
-	gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )"
+	gitaly? ( ~www-servers/gitlab-gitaly-${GITALY_VERSION} )"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild
index 51ac257..d751da2 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.1.7.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
-	gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )"
+	gitaly? ( ~www-servers/gitlab-gitaly-${GITALY_VERSION} )"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild
index f227154..f127e5b 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.2.7.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
-	gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )"
+	gitaly? ( ~www-servers/gitlab-gitaly-${GITALY_VERSION} )"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild
index d9d62f7..850fd04 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.3.0_rc2.ebuild
@@ -66,7 +66,7 @@ COMMON_DEPEND="
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
-	~www-servers/gitaly-${GITALY_VERSION}"
+	~www-servers/gitlab-gitaly-${GITALY_VERSION}"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
index 135f581..a067197 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( >=www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
-	>=www-servers/gitaly-${GITALY_VERSION}"
+	>=www-servers/gitlab-gitaly-${GITALY_VERSION}"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
diff --git a/www-servers/gitaly/Manifest b/www-servers/gitaly/Manifest
deleted file mode 100644
index 1c044bf..0000000
--- a/www-servers/gitaly/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455
-DIST gitaly-0.11.0.tar.bz2 1446943 SHA256 fe4b57fbc05038eb297fa650dd41c1ae6049fc974f43aa7b4993f500627d9e5c SHA512 396d680b66812a7be1dfb9d54d24c0b06c5b70b7bc94c9cc4de8c5e7ccc875682efafa063370d1b2e352458e8bc24db77ca7ad127e4c5af37e5e6c415ce3a7ac WHIRLPOOL 6050a67cb97c9f4072ae81a5c5364bd910c15f54853e974e7f62fee8a95ca9c38ed1fc550f4df71fbecd8b314aacad77cf24b67fcd6bf340c68a3db3fe74854c
-DIST gitaly-0.11.2.tar.bz2 1465321 SHA256 4273842b37e2cde3d09a60209ff11cec3f235ebcef304d9c90e9e8aabb8691ed SHA512 a59e6786ff2e8f90a26303c7c74a78b0e96bf948f5f3a51a92799a63fb9489cefe95c4d19a9ab86ab37bbc7ff82b94dba844a3b45bba40e9c03bddda261f26d6 WHIRLPOOL 820c1a371051b1ae06c07895c7c5dfa59680785608f238bc6a1729f9d87949d62768a7eb76a09a66f33c962231a108628ff710cbd4b924f798d0c3356686faab
-DIST gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8
-DIST gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34
-EBUILD gitaly-0.10.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e
-EBUILD gitaly-0.11.0.ebuild 1595 SHA256 d1431b825cc5d1c3f36d2626298093a6e99fbf2f4704c8089050f85061950043 SHA512 902de6ab0911bee3389f5ef0854419be228070952b65a94e6277c9b22babee6cc9ab77c24007b94dfb51e9014c891c74d4e7723188a6ce58b6e2d187bb4b9b12 WHIRLPOOL 2a8f2a8c6a6361586bc1871d8b8b217b65f827828f6adb3eee56bb4c30d39bd6c9a6b01fb91adf42f870b070e405187f49867237473995c1b338178b96399279
-EBUILD gitaly-0.11.2.ebuild 1595 SHA256 5844c1a6ec52bfae6115786b7311fac3d71dddcab168fba2f27ab237a1e64779 SHA512 acada469faebe85b38e06ecbf180bb99574a839beefa9bdb922b4f73d836c4ab76b05a84964acf9d5bf13aa42defcd0cff7f6c4aefca0c3bb6ea017bfae54643 WHIRLPOOL 5f7dec3007330df462761eb6a73e28f07d954e0095e2033edce7b507a93dc71b62b55272387c0581e926cdffc75345c43a1681a201f8dfb4ad013f1805a1ed49
-EBUILD gitaly-0.3.0.ebuild 1593 SHA256 f07387ac6ec3c68d2c4aa8894804caf5a456b8e12e15937d82fda4d2ed864185 SHA512 95d19b0e799195fa5e3d8cc2879c1017503f68aa586a074119441fbbcff28d2cd9d538830a3a2b40a542bdbfa99518f9afd09232907ac7e763d500cf00abe32f WHIRLPOOL 1e3c778ac33e385865a610dfef5ee07841e9a7b91800b94a3a88714caf38084584524b2f120553a9f13ee2df57309fbd8e9b1e119cdbfd2f6cc1749e25f14bcf
-EBUILD gitaly-0.6.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e
-MISC ChangeLog 605 SHA256 e8f35a4f363611ca88e331ac79ddabe7e6a140d543c405e3f02d343eb7c26c9b SHA512 eff343fb288297aad8ed17a28f00c1365870a8707a38d5ff0c57ed5c84c6942129165f3522ae34df1066729c25b5946dbd6ce8a7f8e68cfd3ffe39f492539bc7 WHIRLPOOL 45361d6dc967150d3bf4cc27733126654b30f6f71fdbb97603c9a995762f6713a277fe3ceb11b1afe38f3c8377238c2e2f70716b84d40b5ca2e8b3842a275f16
-MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/www-servers/gitaly/gitaly-0.11.2.ebuild b/www-servers/gitaly/gitaly-0.11.2.ebuild
deleted file mode 100644
index ec88130..0000000
--- a/www-servers/gitaly/gitaly-0.11.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils golang-build golang-vcs-snapshot user
-
-EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
-
-MY_PV="v${PV/_/-}"
-MY_GIT_HASH="e8f0485"
-
-DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
-HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-LICENSE="MIT"
-SLOT="0/${PVR}"
-
-DEPEND=">=dev-lang/go-1.8.3"
-
-RESTRICT="test mirror"
-
-#MY_USER="gitlab_pages"
-
-pkg_setup() {
-	eerror "This ebuild is but a dummy placeholder. Gitaly is not yet supported."
-	die "Gitaly is not yet supported."
-}
-
-#pkg_setup() {
-#	enewgroup ${MY_USER}
-#	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
-#}
-
-#src_prepare() {
-#	epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch"
-#
-#	sed -i -E \
-#		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
-#		src/gitlab.com/gitlab-org/${PN}/Makefile
-#
-#	eapply_user
-#}
-
-#src_compile() {
-#	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
-#}
-
-#src_install() {
-#	golang-build_src_install
-#	dobin bin/*
-#	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
-#
-#	# rc script
-#	local rcscript="${PN}-0.3.2.init"
-#
-#	cp "${FILESDIR}/${rcscript}" "${T}" || die
-#	sed -i \
-#		-e "s|@USER@|${MY_USER}|g" \
-#		"${T}/${rcscript}" \
-#		|| die "failed to filter ${rcscript}"
-#
-#	newinitd "${T}/${rcscript}" "${PN}"
-#	newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}"
-#}
diff --git a/www-servers/gitaly/ChangeLog b/www-servers/gitlab-gitaly/ChangeLog
similarity index 51%
rename from www-servers/gitaly/ChangeLog
rename to www-servers/gitlab-gitaly/ChangeLog
index caaffa9..bc3b298 100644
--- a/www-servers/gitaly/ChangeLog
+++ b/www-servers/gitlab-gitaly/ChangeLog
@@ -1,3 +1,18 @@
+  08 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
+  files/gitlab-gitaly-0.11.2-r1.init:
+  www-servers/gitlab-gitaly:  Fix silly, *silly* typo.
+
+*gitlab-gitaly-0.11.2-r1 (08 Jul 2017)
+
+  08 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
+  +files/gitlab-gitaly-0.11.2-r1.init, +gitlab-gitaly-0.11.2-r1.ebuild,
+  -gitlab-gitaly-0.11.2.ebuild:
+  www-servers/gitlab-gitaly:  Fix bug in checkpath in init script
+
+  08 Jul 2017; Manuel Friedli <manuel@fritteli.ch> -gitaly-0.10.0-r1.ebuild,
+  gitaly-0.11.2.ebuild:
+  www-servers/gitaly:  Add ebuid for gitaly-0.11.2
+
 *gitaly-0.11.0 (17 Jun 2017)
 *gitaly-0.11.2 (17 Jun 2017)
 
diff --git a/www-servers/gitlab-gitaly/Manifest b/www-servers/gitlab-gitaly/Manifest
new file mode 100644
index 0000000..a446b23
--- /dev/null
+++ b/www-servers/gitlab-gitaly/Manifest
@@ -0,0 +1,16 @@
+AUX 0001-gitlab-gitaly-0.10.0-fix-Makefile.patch 248 SHA256 03b4315da76b4409e990a53edce0cb21828a4c505f11266ca3f77e70e7c9857e SHA512 7aa509cf79a538398e9dc09cf92e34d6a8877da13ad1184e37f5e7ba4c24eb88251f692ebefddd07e3bf157a143d93dffb72ccbdfdd5ab4d52bbcd111e6e9380 WHIRLPOOL a03702f7d744239869249f53c49cfb3f62cbb58f75bc624079aced8219fa3d818d6eee9233953483c48a2138399442b7a89ca4ef1d93b96767e8d471dc5db00e
+AUX 0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch 692 SHA256 5f9eda6f748a7622671a41632614e035267520388af90b9c9bddefa2731652f6 SHA512 942c2e012d013d5eca80a679a1ecaf035c1d6b93251c827cf75b31edc5c9e211edf78d41a1148b84142338ae3f19fdd5673b207f18659acfc78982a0a6d4f253 WHIRLPOOL ff414bbfcb1fb6eaae5bc8e5d41cc27e0e93a1b216842d47570f8725988b594ad236c2d33ed8075ecd24f2939c46a2bdb5f77744ed26ab5bd2afcd0a9a93201d
+AUX gitlab-gitaly-0.10.0.conf 281 SHA256 54a309ecd95a0c907951a36db5542678f9e68c7e354dcc3278882512a82c5a99 SHA512 23875632a1c523eea855c10b03dab4a2aa38cc8de6be070df4ba8c85360edf8c5c2a636601f05004f62792c9e4304822c679841180b9a23c963de76a7c770873 WHIRLPOOL fac7949ddc161d2df6d4f0168029c405a0b68f64fee9cedf167bdab9ea55de1e52735476402e878f67339f969e40bd341cd21f31c99dd86d997df08a3ce8f217
+AUX gitlab-gitaly-0.10.0.init 592 SHA256 31889dd48b19bd84aaeb64f943ea9ff173b7a2291b3f0dd465c08256d2aee9ee SHA512 81db4434946691a714945e2fab06e302c0994805b4b285e916363461160b30c919e9373d10e293eb2163dc46f132d1c6f4a5c9ab50cad3933827833d48a2832b WHIRLPOOL 1d7287c5dd41a8c63070467640bcf6f5c5fd66a03e7a75ddc000ab67860dd1f76098a78edc36af64ebd34deda103f2284bebcb153906a79310ac9808cfe75a76
+AUX gitlab-gitaly-0.11.2-r1.init 631 SHA256 98c1b8db2fd54d968b58a1c5a766090e85010b2da3af22232adcb16743f46207 SHA512 b018e11b2177f4869aa5bc87c92669d312a25d1619addd134f022a33afba7867bfd21096dec74d435bf41c0eefa5d539d39d6b6ad3322125b9f4ec72be70b07c WHIRLPOOL 42f42c9d37eb5ea9dc0fd5116caec9ca6b7d4389a42a5ca5cc8399e4b9e02c80b4bd97462fb0b4dc5f26b9733a8f3cab4d6c6ef7a9dfba5121b8f8191322e9cd
+DIST gitlab-gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455
+DIST gitlab-gitaly-0.11.0.tar.bz2 1446943 SHA256 fe4b57fbc05038eb297fa650dd41c1ae6049fc974f43aa7b4993f500627d9e5c SHA512 396d680b66812a7be1dfb9d54d24c0b06c5b70b7bc94c9cc4de8c5e7ccc875682efafa063370d1b2e352458e8bc24db77ca7ad127e4c5af37e5e6c415ce3a7ac WHIRLPOOL 6050a67cb97c9f4072ae81a5c5364bd910c15f54853e974e7f62fee8a95ca9c38ed1fc550f4df71fbecd8b314aacad77cf24b67fcd6bf340c68a3db3fe74854c
+DIST gitlab-gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8
+DIST gitlab-gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34
+EBUILD gitlab-gitaly-0.10.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fafebffd88f7ab12399c12076ee67632a SHA512 ed5e46fa20bfeb81da16f8fb0b702b7d8f71ca5d35f81456fd2ee31eec781cae75e14081b2eeaae3959d6b5db7eb5ed84398c90c6f687b0a3dbf9e602b7cb8f6 WHIRLPOOL 7c6cbdd81e2da6f659482db204433430e2bb947175a56b85addd688dc511cae7dea45a99796c14c6cb2d352fb868752bafc14af34f100d538b5b40bebe2a0846
+EBUILD gitlab-gitaly-0.11.0.ebuild 1613 SHA256 6a93e81f94c7af310e4076fa7c81d93d5b4ed3a8c0a2812a58fab96bd6c318ce SHA512 0e2732f634de08a243b57b3766a3b1f3c7d7eafafbf40f72d87dfdbb51aad963aec45899d14a9114f43415dd5dde6734f5619613127485fbc64440b17734db8f WHIRLPOOL 750c4bd7349bd9ced835b3315e31d25ddc0e7fd7ba523ebe31feee86c19b1e0ef7f8e9f1c8fb483fb6b7b246db76ba195a3f48f4b834ff727ce3c2a7512f218e
+EBUILD gitlab-gitaly-0.11.2-r1.ebuild 928 SHA256 d0cc04e832356a9a55a0ea5b52ddf971a97c601b9e81b68608ca4505f7ca338f SHA512 25d40a8f201c6732fef0789bd1cf5cf249385dfdc9fcb71d9cd86a0c704e409876895082d1e8ef40abdffb8abb61ded7eb7e025aaabdc6c09b4c414e4f430acc WHIRLPOOL 8cea0bc66ae32692e2e12793f9919e96a424e1d6ba98e4d543c47bc5a4f5d1ca5cb31b0416e10c1bb3cf4ee9d7023f978f5a871fbade4751682ba4f47614c4ff
+EBUILD gitlab-gitaly-0.3.0.ebuild 1611 SHA256 d4a80bcc6b9f1f6de0308e02fce0927e10c83620bc546ccc5b2ac8166b7cd5f0 SHA512 28ddef1dd80ce57a978e81048e7f07598dd83c83e0fdf4b6dbf01ff543d4abb4de437e658b07b3d60757163ed30e970327403ffd057e1d737d3dd8e23a534d38 WHIRLPOOL 3f42b071f5acaff80072a5708e50fcd8b4a397a6f2e5772f7234fbba3f606c89664433328495f59a84f5f5468503c11961b2d455878e2f445142778c7645397d
+EBUILD gitlab-gitaly-0.6.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fafebffd88f7ab12399c12076ee67632a SHA512 ed5e46fa20bfeb81da16f8fb0b702b7d8f71ca5d35f81456fd2ee31eec781cae75e14081b2eeaae3959d6b5db7eb5ed84398c90c6f687b0a3dbf9e602b7cb8f6 WHIRLPOOL 7c6cbdd81e2da6f659482db204433430e2bb947175a56b85addd688dc511cae7dea45a99796c14c6cb2d352fb868752bafc14af34f100d538b5b40bebe2a0846
+MISC ChangeLog 1165 SHA256 00b2944d5fa641f9a0d89e98532d73a73c966b8b5ceac1f7ef3dd203647cc03e SHA512 f1c63e3da739b211f1dd51b34dc6b430b41bce0ff0a97f8c8b3f5daa8f1e7cd4fc71ce0615a97a694d40a6f8907efe569dce10efae4fa185411bfa022364446c WHIRLPOOL 0f66fd439a16fb17e2087cc00b20b52dff2a5618912ff2f729d25c53923235b41336127b48535f82ffac884aea27365c2f974504b813d01f14a7d92ba59ef4d4
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.10.0-fix-Makefile.patch b/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.10.0-fix-Makefile.patch
new file mode 100644
index 0000000..9ca129f
--- /dev/null
+++ b/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.10.0-fix-Makefile.patch
@@ -0,0 +1,10 @@
+diff --git a/Makefile b/Makefile
+index c822059..342da88 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-PREFIX=/usr/local
++PREFIX=${DESTDIR}/usr
+ PKG=gitlab.com/gitlab-org/gitaly
+ BUILD_DIR=$(shell pwd)
+ BIN_BUILD_DIR=${BUILD_DIR}/_build/bin
diff --git a/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch
new file mode 100644
index 0000000..fab79f9
--- /dev/null
+++ b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch
@@ -0,0 +1,21 @@
+diff --git a/config.toml.example b/config.toml.example
+index 3a987f9..801d192 100644
+--- a/config.toml.example
++++ b/config.toml.example
+@@ -1,6 +1,6 @@
+ # Example Gitaly configuration file
+ 
+-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
++socket_path = "/run/gitlab/gitaly.socket"
+ 
+ # # Optional: listen on a TCP socket. This is insecure (no authentication)
+ # listen_addr = "localhost:9999"
+@@ -12,7 +12,7 @@ socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
+ 
+ [[storage]]
+ name = "default"
+-path = "/home/git/repositories"
++path = "/var/lib/git/repositories"
+ 
+ # # You can optionally configure more storages for this Gitaly instance to serve up
+ #
diff --git a/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.conf b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.conf
new file mode 100644
index 0000000..647272d
--- /dev/null
+++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.conf
@@ -0,0 +1,8 @@
+CONFIGFILE=/etc/gitlab/gitaly-config.toml
+RUNAS_USER=git
+RUNAS_GROUP=${RUNAS_USER}
+LOGFILE=/var/log/gitlab/gitlab-gitaly.log
+
+# This must match the setting in /etc/gitlab/gitaly-config.toml
+# If not using a socket, simply comment out or delete the next line.
+SOCKETDIR=/run/gitlab
diff --git a/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.init b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.init
new file mode 100644
index 0000000..5e107a3
--- /dev/null
+++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.10.0.init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+
+start() {
+	ebegin "Starting gitlab-gitaly"
+
+	checkpath -f -m 640 -o ${RUNAS_USER}:${RUNAS_GROUP} ${LOFGILE}
+	[ -z "${SOCKETDIR}" ] || checkpath -d ${SOCKETDIR}
+
+	start-stop-daemon --start --exec /usr/bin/gitlab-gitaly --pidfile /run/gitlab-gitaly.pid \
+	--make-pidfile --background --user ${RUNAS_USER}:${RUNAS_GROUP} --stdout "${LOGFILE}" --stderr "${LOGFILE}" \
+	-- ${CONFIGFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gitlab-gitaly"
+	start-stop-daemon --stop --exec /usr/bin/gitlab-gitaly --pidfile /run/gitlab-gitaly.pid --user ${RUNAS_USER}:${RUNAS_GROUP}
+	eend $?
+}
diff --git a/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2-r1.init b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2-r1.init
new file mode 100644
index 0000000..094d176
--- /dev/null
+++ b/www-servers/gitlab-gitaly/files/gitlab-gitaly-0.11.2-r1.init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+
+start() {
+	ebegin "Starting gitlab-gitaly"
+
+	checkpath -f -m 640 -o ${RUNAS_USER}:${RUNAS_GROUP} ${LOGFILE}
+	[ -z "${SOCKETDIR}" ] || checkpath -d -m 755 -o ${RUNAS_USER}:${RUNAS_GROUP} ${SOCKETDIR}
+
+	start-stop-daemon --start --exec /usr/bin/gitlab-gitaly --pidfile /run/gitlab-gitaly.pid \
+	--make-pidfile --background --user ${RUNAS_USER}:${RUNAS_GROUP} --stdout "${LOGFILE}" --stderr "${LOGFILE}" \
+	-- ${CONFIGFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gitlab-gitaly"
+	start-stop-daemon --stop --exec /usr/bin/gitlab-gitaly --pidfile /run/gitlab-gitaly.pid --user ${RUNAS_USER}:${RUNAS_GROUP}
+	eend $?
+}
diff --git a/www-servers/gitaly/gitaly-0.6.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild
similarity index 92%
rename from www-servers/gitaly/gitaly-0.6.0.ebuild
rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild
index c798874..2079356 100644
--- a/www-servers/gitaly/gitaly-0.6.0.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild
@@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user
 
 EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
 
+MY_PN="gitaly"
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="661135a"
 
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
diff --git a/www-servers/gitaly/gitaly-0.11.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.0.ebuild
similarity index 92%
rename from www-servers/gitaly/gitaly-0.11.0.ebuild
rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.11.0.ebuild
index 12cb453..f576735 100644
--- a/www-servers/gitaly/gitaly-0.11.0.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.0.ebuild
@@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user
 
 EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
 
+MY_PN="gitaly"
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="c8bc0ce"
 
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild
new file mode 100644
index 0000000..fbb9465
--- /dev/null
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git"
+EGIT_COMMIT="v${PV}"
+
+inherit eutils git-2 user
+
+DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
+HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+
+DEPEND=">=dev-lang/go-1.8.3"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.patch"
+	epatch "${FILESDIR}/0002-${PN}-0.10.0-fix-config.toml.example.patch"
+}
+
+src_install() {
+	# TODO fowners, fperms on config.toml.example
+	insinto "/etc/gitlab"
+	newins "config.toml.example" "gitaly-config.toml"
+	newconfd "${FILESDIR}/${PN}-0.10.0.conf" "gitlab-gitaly"
+	newinitd "${FILESDIR}/${PN}-0.11.2-r1.init" "gitlab-gitaly"
+	into "/usr"
+	newbin "gitaly" "gitlab-gitaly"
+}
diff --git a/www-servers/gitaly/gitaly-0.3.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild
similarity index 92%
rename from www-servers/gitaly/gitaly-0.3.0.ebuild
rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild
index 5cce79d..16f383a 100644
--- a/www-servers/gitaly/gitaly-0.3.0.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild
@@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user
 
 EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
 
+MY_PN="gitaly"
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="fdcb2c9"
 
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
diff --git a/www-servers/gitaly/gitaly-0.10.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild
similarity index 92%
rename from www-servers/gitaly/gitaly-0.10.0.ebuild
rename to www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild
index c798874..2079356 100644
--- a/www-servers/gitaly/gitaly-0.10.0.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild
@@ -7,12 +7,13 @@ inherit eutils golang-build golang-vcs-snapshot user
 
 EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
 
+MY_PN="gitaly"
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="661135a"
 
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
+SRC_URI="https://gitlab.com/gitlab-org/${MY_PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
diff --git a/www-servers/gitaly/metadata.xml b/www-servers/gitlab-gitaly/metadata.xml
similarity index 100%
rename from www-servers/gitaly/metadata.xml
rename to www-servers/gitlab-gitaly/metadata.xml