diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile
index e0afdae77c5c..f5e4f72d9556 100644
--- a/misc/far2l/Makefile
+++ b/misc/far2l/Makefile
@@ -1,58 +1,53 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	far2l
-# Upstream tags (pre-)releases very rarely and irregularly, so keep using
-# the g${DATE} format even for tagged releases to avoid bumping PORTEPOCH
-# in case we'd have to use raw commit hashes again in the future.
-PORTVERSION=	g20211204 # don't forget to update unknown -> git hash below
+PORTVERSION=	2.4.0
+DISTVERSIONPREFIX=	v_
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Port of FAR v2 to Unix-like systems
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gawk:lang/gawk gm4:devel/m4 \
 		${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog
 LIB_DEPENDS=	libfmt.so:devel/libfmt \
 		libpcre.so:devel/pcre \
 		libuchardet.so:textproc/uchardet \
 		libxerces-c.so:textproc/xerces-c3
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elfmz
-GH_TAGNAME=	v2021-12-04_alpha
 
 USES=		cmake compiler:c++11-lang libarchive pkgconfig shebangfix ssl
 SHEBANG_FILES=	far2l/bootstrap/view.sh
 
 OPTIONS_DEFINE=	NFS SFTP SMB WEBDAV WXGTK X11
 OPTIONS_DEFAULT=	NFS SFTP WEBDAV WXGTK X11
 OPTIONS_SUB=	yes
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 
 SFTP_DESC=	SFTP file transfer support
 SFTP_LIB_DEPENDS=	libssh.so:security/libssh
 
 SMB_USES=	samba:lib
 
 WEBDAV_DESC=	WebDav protocol support via libneon
 WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 WXGTK_CMAKE_OFF=	-DUSEWX:BOOL=OFF
 WXGTK_USE=	WX=3.0+
 
 X11_DESC=	Build with TTY X11 extensions
 X11_CMAKE_OFF=	-DTTYX:BOOL=OFF
 X11_USES=	xorg
 X11_USE=	XORG=ice,sm,x11,xext
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-unknown,-git-48654cc,' \
-		${WRKSRC}/far2l/bootstrap/scripts/vbuild.sh
 	@${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \
 		-0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,'
 
 .include <bsd.port.mk>
diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo
index 6e4d4f1b5024..6e12a901869f 100644
--- a/misc/far2l/distinfo
+++ b/misc/far2l/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638615268
-SHA256 (elfmz-far2l-g20211204-v2021-12-04_alpha_GH0.tar.gz) = 9d3500e563db261332147be0cde9f2284ec21519ed045f12e27948400d361eea
-SIZE (elfmz-far2l-g20211204-v2021-12-04_alpha_GH0.tar.gz) = 5471538
+TIMESTAMP = 1641943318
+SHA256 (elfmz-far2l-v_2.4.0_GH0.tar.gz) = a595f7f2b48aaf6cfd61c1539bb52207f8f985576ee928915f54b675666e9f88
+SIZE (elfmz-far2l-v_2.4.0_GH0.tar.gz) = 6223889