diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
index d79a2f6a838893..d7ffb50f035b9e 100644
--- a/srcpkgs/etcd/template
+++ b/srcpkgs/etcd/template
@@ -1,10 +1,14 @@
 # Template file for 'etcd'
 pkgname=etcd
 version=3.7.0
-revision=1
+revision=2
 build_style=go
 go_import_path="go.etcd.io/etcd/v3"
-go_package="${go_import_path} go.etcd.io/etcd/etcdctl/v3"
+go_package="
+ go.etcd.io/etcd/server/v3
+ go.etcd.io/etcd/etcdctl/v3
+ go.etcd.io/etcd/etcdutl/v3
+"
 short_desc="Distributed reliable key-value store"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
@@ -17,4 +21,5 @@ make_dirs="/var/lib/etcd 0755 etcd etcd"
 
 post_install() {
 	vsv etcd
+	mv ${DESTDIR}/usr/bin/{server,etcd}
 }