diff --git a/shells/Makefile b/shells/Makefile
index a603675b0d6d..ddcaf18d1fec 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -14,6 +14,7 @@
     SUBDIR += bicon
     SUBDIR += ch
     SUBDIR += dash
+    SUBDIR += elvish
     SUBDIR += envy
     SUBDIR += es
     SUBDIR += esh
diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
new file mode 100644
index 000000000000..0567618eb1a4
--- /dev/null
+++ b/shells/elvish/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME=	elvish
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.12
+CATEGORIES=	shells
+
+MAINTAINER=	vendion@gmail.com
+COMMENT=	Friendly Interactive Shell and Expressive Programming Language
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=	go
+USE_GITHUB=	yes
+GH_ACCOUNT=	elves
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+
+PLIST_FILES=	bin/elvish
+
+do-build:
+	@cd ${GO_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build
+
+do-install:
+	${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} \
+	${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/shells/elvish/distinfo b/shells/elvish/distinfo
new file mode 100644
index 000000000000..c213bf21fa12
--- /dev/null
+++ b/shells/elvish/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1555988368
+SHA256 (elves-elvish-v0.12_GH0.tar.gz) = edd03f4acf50beb03a663804e4da8b9d13805d471245c47c1b71f24c125cb9a2
+SIZE (elves-elvish-v0.12_GH0.tar.gz) = 1274675
diff --git a/shells/elvish/pkg-descr b/shells/elvish/pkg-descr
new file mode 100644
index 000000000000..e18e2c4ed0bd
--- /dev/null
+++ b/shells/elvish/pkg-descr
@@ -0,0 +1,4 @@
+Elvish is a friendly interactive shell and an expressive programming language.
+It runs on Linux, BSDs, macOS and Windows.
+
+WWW: https://elv.sh/