diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
index 48f8d9052e95..dd64faf48322 100644
--- a/shells/elvish/Makefile
+++ b/shells/elvish/Makefile
@@ -1,37 +1,35 @@
 PORTNAME=	elvish
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.1
-PORTREVISION=	6
+DISTVERSION=	0.21.0
 CATEGORIES=	shells
 
 MAINTAINER=	vendion@gmail.com
 COMMENT=	Elvish = Expressive Programming Language + Versatile Interactive Shell
 WWW=		https://elv.sh/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${GO_WRKSRC}/LICENSE
 
 USES=		cpe go:modules
 CPE_VENDOR=	elv
 USE_GITHUB=	yes
 GH_ACCOUNT=	elves
-GH_PROJECT=	elvish
 GH_TUPLE=	creack:pty:v1.1.21:creack_pty/vendor/github.com/creack/pty \
-		etcd-io:bbolt:v1.3.8:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
-		golang:sync:v0.6.0:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:v0.16.0:golang_sys/vendor/golang.org/x/sys \
+		etcd-io:bbolt:v1.3.10:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		golang:sync:v0.8.0:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:v0.24.0:golang_sys/vendor/golang.org/x/sys \
 		google:go-cmp:v0.6.0:google_go_cmp/vendor/github.com/google/go-cmp \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		nimblebun:go-lsp:v1.1.0:nimblebun_go_lsp/vendor/pkg.nimblebun.works/go-lsp \
 		sourcegraph:jsonrpc2:v0.2.0:sourcegraph_jsonrpc2/vendor/github.com/sourcegraph/jsonrpc2
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	./cmd/elvish
 GO_BUILDFLAGS=	-ldflags="-s -w -X src.elv.sh/pkg/buildinfo.BuildVariant=freebsd" \
 		-buildmode=pie
 GO_TESTFLAGS=	-race
 CGO_ENABLED=	0
 
-PLIST_FILES=	bin/elvish
+PLIST_FILES=	"@shell bin/elvish"
 
 .include <bsd.port.mk>
diff --git a/shells/elvish/distinfo b/shells/elvish/distinfo
index 4cad494e2984..6af20be27c18 100644
--- a/shells/elvish/distinfo
+++ b/shells/elvish/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1708085748
-SHA256 (elves-elvish-v0.20.1_GH0.tar.gz) = 6a6006015f44def98676eaed611702b000d66838c0e76da572d517d9bde5c388
-SIZE (elves-elvish-v0.20.1_GH0.tar.gz) = 862793
+TIMESTAMP = 1725469719
+SHA256 (elves-elvish-v0.21.0_GH0.tar.gz) = 3a4b93c3c99fe2f9847de35d64be24e2d4b9c12d429cd9831b4571993a66bb7a
+SIZE (elves-elvish-v0.21.0_GH0.tar.gz) = 958170
 SHA256 (creack-pty-v1.1.21_GH0.tar.gz) = 1282f0912dd7b02acac253d1203343b06378ed8bac1c45c9ed7df05e6840365d
 SIZE (creack-pty-v1.1.21_GH0.tar.gz) = 20132
-SHA256 (etcd-io-bbolt-v1.3.8_GH0.tar.gz) = f96be484d9c9b9751ee021951111ec6ac06b45a61e913f9ea6683819699b784f
-SIZE (etcd-io-bbolt-v1.3.8_GH0.tar.gz) = 117416
-SHA256 (golang-sync-v0.6.0_GH0.tar.gz) = 23b8fca95397b2293e64e58d333633051ec942b46318ad8f630318e801658b67
-SIZE (golang-sync-v0.6.0_GH0.tar.gz) = 17605
-SHA256 (golang-sys-v0.16.0_GH0.tar.gz) = 9c17b728aa75f4fc4743c3f5c0dccdc3b7f9ac7c12b3124b666672cc571f657e
-SIZE (golang-sys-v0.16.0_GH0.tar.gz) = 1444155
+SHA256 (etcd-io-bbolt-v1.3.10_GH0.tar.gz) = 4991a0f2cfb4fd4530c450e3b913cf38fc8566d115c514ecbcef5946a7391400
+SIZE (etcd-io-bbolt-v1.3.10_GH0.tar.gz) = 125701
+SHA256 (golang-sync-v0.8.0_GH0.tar.gz) = 1872b89e8bf234d4c65edca0bf7c7fd6c414cf74a5a9e10463eb2483cf7b361f
+SIZE (golang-sync-v0.8.0_GH0.tar.gz) = 18181
+SHA256 (golang-sys-v0.24.0_GH0.tar.gz) = 3402ba7b578406df222693bac2b4011b5c9ab9180b0c123db1ed92da8ba11052
+SIZE (golang-sys-v0.24.0_GH0.tar.gz) = 1501680
 SHA256 (google-go-cmp-v0.6.0_GH0.tar.gz) = d14f7d57b0f6d25771bee3d7d5d038f532539e71bfc934772b1c0467ab90fa86
 SIZE (google-go-cmp-v0.6.0_GH0.tar.gz) = 104784
 SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88d0e292db55b513ef514b7d369883a6
 SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713
 SHA256 (nimblebun-go-lsp-v1.1.0_GH0.tar.gz) = eedd7ad24c1a32e9790a9dfb503f194b8551d5feb1737ff033013d484923cd02
 SIZE (nimblebun-go-lsp-v1.1.0_GH0.tar.gz) = 34070
 SHA256 (sourcegraph-jsonrpc2-v0.2.0_GH0.tar.gz) = 21334f66125a54beb86cdad3bd9fe5a790d1d7f94da4b70e11a95d0ab8104320
 SIZE (sourcegraph-jsonrpc2-v0.2.0_GH0.tar.gz) = 18152