diff --git a/www-servers/gitaly/Manifest b/www-servers/gitaly/Manifest
index 7fd6736..b12ade8 100644
--- a/www-servers/gitaly/Manifest
+++ b/www-servers/gitaly/Manifest
@@ -1,4 +1,6 @@
 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.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 392 SHA256 c85d6fb8a93d47762d1a6279f7523138234a5951a71700a0abb5bd6c69405704 SHA512 ff7a8dc6e0457f88e22c93ae062fb7c4da834cf679e0742f276465060164dbb510573b55bab7471ae851e5380cc60fece093ef973d4c0da4413ce0f8f3c99263 WHIRLPOOL d3b4cf6e3182e5be74aa8689b2ea5b3baf53bbf2ff2ad56bc60429d89627aad8d148877c285cc1ed0e8960ad5e02344901c3554e7e78c2e2a3a1fca9c5533825
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/www-servers/gitaly/gitaly-0.6.0.ebuild b/www-servers/gitaly/gitaly-0.6.0.ebuild
new file mode 100644
index 0000000..c798874
--- /dev/null
+++ b/www-servers/gitaly/gitaly-0.6.0.ebuild
@@ -0,0 +1,67 @@
+# 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="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"
+
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+
+DEPEND=">=dev-lang/go-1.5"
+
+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}"
+#}