diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index dd3b82593bc..917a75a2732 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,13 +1,14 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.2.10
-revision=1
+revision=2
 build_style=go
 short_desc="Distributed reliable key-value store"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 hostmakedepends="git glide"
 go_import_path="github.com/coreos/etcd"
+go_package="${go_import_path} ${go_import_path}/etcdctl"
 homepage="https://coreos.com/etcd/docs/latest/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
 checksum=86b7afd78b3a409b23ddf9d889b74c4edecf0fec1148f83bf025911705895f08
@@ -15,17 +16,9 @@ conf_files="/etc/sv/etcd/conf"
 system_accounts="etcd"
 make_dirs="/var/lib/etcd 0755 etcd etcd"
 
-do_build() {
-	if [[ "${go_get}" != "yes" ]]; then
-		local path="${GOPATH}/src/${go_import_path}"
-		mkdir -p "$(dirname ${path})"
-		ln -fs $PWD "${path}"
-	fi
-
+pre_build() {
+	cd $GOSRCPATH
 	glide install
-	go_package=${go_package:-$go_import_path}
-	go get -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_package}
-	go get -x -tags "${go_build_tags}" -ldflags "${go_ldflags}" ${go_import_path}/etcdctl
 }
 
 post_install() {