diff --git a/srcpkgs/geth b/srcpkgs/geth
new file mode 120000
index 00000000000..643fd89ff2c
--- /dev/null
+++ b/srcpkgs/geth
@@ -0,0 +1 @@
+go-ethereum
\ No newline at end of file
diff --git a/srcpkgs/geth/template b/srcpkgs/geth/template
deleted file mode 100644
index 58f8be4a333..00000000000
--- a/srcpkgs/geth/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'geth'
-pkgname=geth
-version=1.8.18
-revision=2
-wrksrc="go-ethereum-${version}"
-build_style=go
-go_import_path="github.com/ethereum/go-ethereum"
-go_package="${go_import_path}/cmd/geth"
-short_desc="Official Go implementation of the Ethereum protocol"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="GPL-3.0-only"
-homepage="https://geth.ethereum.org"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=cbab18a733298830c9ed1e19c1ece37edf417fd55ec8f198803048ecc3ffa0b9
diff --git a/srcpkgs/go-ethereum/template b/srcpkgs/go-ethereum/template
new file mode 100644
index 00000000000..d38bb25aa77
--- /dev/null
+++ b/srcpkgs/go-ethereum/template
@@ -0,0 +1,28 @@
+# Template file for 'go-ethereum'
+pkgname=go-ethereum
+version=1.8.18
+revision=3
+build_style=go
+go_import_path=github.com/ethereum/go-ethereum
+go_package="${go_import_path}/cmd/abigen
+${go_import_path}/cmd/bootnode
+${go_import_path}/cmd/evm
+${go_import_path}/cmd/geth
+${go_import_path}/cmd/puppeth
+${go_import_path}/cmd/rlpdump
+${go_import_path}/cmd/wnode
+${go_import_path}/cmd/swarm"
+depends="geth"
+short_desc="Full suite of Go Ethereum utilities"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="GPL-3.0-only"
+homepage="https://github.com/ethereum/go-ethereum"
+distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+checksum=cbab18a733298830c9ed1e19c1ece37edf417fd55ec8f198803048ecc3ffa0b9
+
+geth_package() {
+	short_desc="Official Go implementation of the Ethereum protocol"
+	pkg_install() {
+		vmove usr/bin/geth
+	}
+}