diff --git a/shells/Makefile b/shells/Makefile
index b3a1825991d5..3762779fffab 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,63 +1,64 @@
     COMMENT = Shells
 
     SUBDIR += 44bsd-csh
     SUBDIR += anongitssh
     SUBDIR += antibody
     SUBDIR += ast-ksh
     SUBDIR += bash
     SUBDIR += bash-completion
     SUBDIR += bash-static
     SUBDIR += bashc
     SUBDIR += bicon
     SUBDIR += ch
     SUBDIR += dash
     SUBDIR += elvish
     SUBDIR += envy
     SUBDIR += es
+    SUBDIR += etsh
     SUBDIR += fd
     SUBDIR += fish
     SUBDIR += git-prompt.zsh
     SUBDIR += heirloom-sh
     SUBDIR += ibsh
     SUBDIR += ion
     SUBDIR += jailkit
     SUBDIR += klish
     SUBDIR += ksh2020
     SUBDIR += ksh93
     SUBDIR += ksh93-devel
     SUBDIR += mksh
     SUBDIR += modernish
     SUBDIR += nologinmsg
     SUBDIR += nsh
     SUBDIR += ohmyzsh
     SUBDIR += oksh
     SUBDIR += p5-Bash-Completion
     SUBDIR += p5-Shell-Perl
     SUBDIR += p5-Term-Bash-Completion-Generator
     SUBDIR += p5-Term-ShellUI
     SUBDIR += pdksh
     SUBDIR += pear-PHP_Shell
     SUBDIR += psh
     SUBDIR += rc
     SUBDIR += rubygem-shellwords
     SUBDIR += rush
     SUBDIR += sash
     SUBDIR += scponly
     SUBDIR += starship
     SUBDIR += switchBashZsh
     SUBDIR += tcsh_nls
     SUBDIR += tcshrc
     SUBDIR += v7sh
     SUBDIR += viewglob
     SUBDIR += vshnu
     SUBDIR += wcd
     SUBDIR += xonsh
     SUBDIR += yash
     SUBDIR += zsh
     SUBDIR += zsh-antigen
     SUBDIR += zsh-autosuggestions
     SUBDIR += zsh-completions
     SUBDIR += zsh-navigation-tools
     SUBDIR += zsh-syntax-highlighting
 
 .include <bsd.port.subdir.mk>
diff --git a/shells/etsh/Makefile b/shells/etsh/Makefile
new file mode 100644
index 000000000000..e5546c88b171
--- /dev/null
+++ b/shells/etsh/Makefile
@@ -0,0 +1,15 @@
+PORTNAME=	etsh
+DISTVERSION=	5.4.0
+CATEGORIES=	shells
+MASTER_SITES=	https://etsh.nl/src/${PORTNAME}_${PORTVERSION}/
+
+MAINTAINER=	dmenelkir@gmail.com
+COMMENT=	Enhanced V6 Thompson Compatible Shell
+
+LICENSE=	BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WORKSRC}/LICENSE
+
+HAS_CONFIGURE=	yes
+
+.include <bsd.port.mk>
diff --git a/shells/etsh/distinfo b/shells/etsh/distinfo
new file mode 100644
index 000000000000..e52e4a0e5b7d
--- /dev/null
+++ b/shells/etsh/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1656109658
+SHA256 (etsh-5.4.0.tar.gz) = dc64d65d10d71794b05080025a7ee32174ce17fa67a403557f9bb06b0a0ea636
+SIZE (etsh-5.4.0.tar.gz) = 134505
diff --git a/shells/etsh/pkg-descr b/shells/etsh/pkg-descr
new file mode 100644
index 000000000000..590fdcf2c62f
--- /dev/null
+++ b/shells/etsh/pkg-descr
@@ -0,0 +1,4 @@
+Etsh is an enhanced, backward-compatible port of the
+V6 UNIX <-> V6 Thompson shell.
+
+WWW: https://etsh.nl/
diff --git a/shells/etsh/pkg-plist b/shells/etsh/pkg-plist
new file mode 100644
index 000000000000..bfa8a0ad2d69
--- /dev/null
+++ b/shells/etsh/pkg-plist
@@ -0,0 +1,22 @@
+bin/etsh
+bin/tsh
+libexec/etsh-5.4.0/README
+libexec/etsh-5.4.0/etsh/README
+libexec/etsh-5.4.0/etsh/SetP
+libexec/etsh-5.4.0/etsh/SetTandCTTY
+libexec/etsh-5.4.0/etsh/SetV
+libexec/etsh-5.4.0/etsh/etshdir
+libexec/etsh-5.4.0/etsh/history
+libexec/etsh-5.4.0/etsh/history.help
+libexec/etsh-5.4.0/etsh/pev
+libexec/etsh-5.4.0/tsh/README
+libexec/etsh-5.4.0/tsh/fd2
+libexec/etsh-5.4.0/tsh/glob
+libexec/etsh-5.4.0/tsh/goto
+libexec/etsh-5.4.0/tsh/if
+man/man1/etsh.1.gz
+man/man1/fd2.1.gz
+man/man1/glob.1.gz
+man/man1/goto.1.gz
+man/man1/if.1.gz
+man/man1/tsh.1.gz