diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
index dfcf85b1f4..471b7df545 100644
--- a/shells/elvish/Makefile
+++ b/shells/elvish/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	elvish
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.0
+DISTVERSION=	0.16.3
 CATEGORIES=	shells
 
 MAINTAINER=	vendion@gmail.com
 COMMENT=	Elvish = Expressive Programming Language + Versatile Interactive Shell
 
 LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${GO_WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	elves
-GH_TUPLE=	BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
-		creack:pty:v1.1.11:creack_pty/vendor/github.com/creack/pty \
-		etcd-io:bbolt:v1.3.5:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
-		golang:sys:c12d262b63d8:golang_sys/vendor/golang.org/x/sys \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		xiaq:persistent:3175cfb92e14:xiaq_persistent/vendor/github.com/xiaq/persistent
+GH_PROJECT=	elvish
+GH_TUPLE=	creack:pty:v1.1.15:creack_pty/vendor/github.com/creack/pty \
+		etcd-io:bbolt:v1.3.6:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		golang:sys:528a39cd75f3:golang_sys/vendor/golang.org/x/sys \
+		mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	./cmd/elvish
 GO_BUILDFLAGS=	-ldflags="-s -w -X github.com/elves/elvish/pkg/buildinfo.Version=${DISTVERSIONPREFIX}${DISTVERSION} -X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" \
-		-gcflags="all=-trimpath=${GO_WRKSRC}" \
-		-asmflags="all=-trimpath=${GO_WRKSRC}"
+		-buildmode=pie
 GO_TESTFLAGS=	-race
+CGO_ENABLED=	0
 
 PLIST_FILES=	bin/elvish
 
diff --git a/shells/elvish/distinfo b/shells/elvish/distinfo
index 894a48bf6a..679ca0fd25 100644
--- a/shells/elvish/distinfo
+++ b/shells/elvish/distinfo
@@ -1,15 +1,11 @@
-TIMESTAMP = 1612047801
-SHA256 (elves-elvish-v0.15.0_GH0.tar.gz) = 761739307c68fcbc51fd46c052c0a20ae848a30dba1ce3fbb6d27f99672f58e0
-SIZE (elves-elvish-v0.15.0_GH0.tar.gz) = 603715
-SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
-SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (creack-pty-v1.1.11_GH0.tar.gz) = ee903119251fdf7d90dae890fec40015c5b6049daa68ec8d8750c3ebceaaf5ed
-SIZE (creack-pty-v1.1.11_GH0.tar.gz) = 8396
-SHA256 (etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 63fed2e9bbdcc2aa279c2a7ea4a59c39bc21616ec2c96abff0020872beb3dbad
-SIZE (etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 96494
-SHA256 (golang-sys-c12d262b63d8_GH0.tar.gz) = 57663347583aec8dca1fa3f24af9fdf6612e5db0fd65bcef26a79509548c8d40
-SIZE (golang-sys-c12d262b63d8_GH0.tar.gz) = 1060884
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (xiaq-persistent-3175cfb92e14_GH0.tar.gz) = c481b2ba3bb0ad0dc7dc6d0d3179a55f7770c59b83ea54962cc37da5f5864611
-SIZE (xiaq-persistent-3175cfb92e14_GH0.tar.gz) = 19394
+TIMESTAMP = 1631278125
+SHA256 (elves-elvish-v0.16.3_GH0.tar.gz) = ea9d594070cff58ed9caedf4619ee195bfce179f79b9a8d5e7a635ce5cbba551
+SIZE (elves-elvish-v0.16.3_GH0.tar.gz) = 663170
+SHA256 (creack-pty-v1.1.15_GH0.tar.gz) = 5bd33391b7b104ffe3c8b58f2dde4a96a6765336cee7048e39788a55600b5141
+SIZE (creack-pty-v1.1.15_GH0.tar.gz) = 9940
+SHA256 (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = a2e524f7f32c44fa0765de192ac0789c585010cadd2c2ddcf9518e858a96ec1f
+SIZE (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = 98025
+SHA256 (golang-sys-528a39cd75f3_GH0.tar.gz) = 7db2d5679f8593ba23592a38d92c9e07f1faf9baa49f5dc06bc01c57af70d1ab
+SIZE (golang-sys-528a39cd75f3_GH0.tar.gz) = 1211428
+SHA256 (mattn-go-isatty-v0.0.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
+SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710