diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index 9e30fe9c1b..adeb77d0f0 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -15,14 +15,17 @@ conf_files="/etc/sv/etcd/conf"
 system_accounts="etcd"
 make_dirs="/var/lib/etcd 0755 etcd etcd"
 
-broken="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/2422/steps/shell_3/logs/stdio"
+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() {
 	glide install
-}
-
-post_build() {
-	go get -x ${go_import_path}/etcdctl
+	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() {