diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
--- a/shells/elvish/Makefile
+++ b/shells/elvish/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	elvish
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.0
+DISTVERSION=	0.16.3
 CATEGORIES=	shells
 
 MAINTAINER=	vendion@gmail.com
@@ -29,6 +29,15 @@
 
 do-test:
 	@(cd ${GO_WRKSRC} ; \
-		${GO_ENV} ${GO_CMD} test -race ${GO_TESTTARGET})
+	${GO_ENV} ${GO_CMD} test -race ${GO_TESTTARGET}; \
+	cd ${GO_WRKSRC}/website ; \
+	${GO_ENV} ${GO_CMD} test -race ${GO_TESTTARGET})
+
+do-build:
+	(cd ${GO_WRKSRC}; \
+	${ECHO_MSG} "===>  Building $${out} from $${pkg}"; \
+	${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} build ${GO_BUILDFLAGS} \
+	        -o ${GO_WRKDIR_BIN}/elvish \
+	        ${GO_WRKSRC}/cmd/elvish;)
 
 .include <bsd.port.mk>
diff --git a/shells/elvish/distinfo b/shells/elvish/distinfo
--- a/shells/elvish/distinfo
+++ b/shells/elvish/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1612047801
-SHA256 (elves-elvish-v0.15.0_GH0.tar.gz) = 761739307c68fcbc51fd46c052c0a20ae848a30dba1ce3fbb6d27f99672f58e0
-SIZE (elves-elvish-v0.15.0_GH0.tar.gz) = 603715
+TIMESTAMP = 1630943791
+SHA256 (elves-elvish-v0.16.3_GH0.tar.gz) = ea9d594070cff58ed9caedf4619ee195bfce179f79b9a8d5e7a635ce5cbba551
+SIZE (elves-elvish-v0.16.3_GH0.tar.gz) = 663170
 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