diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile
index 0f25526dbc5f..7eca46009e36 100644
--- a/sysutils/lnav/Makefile
+++ b/sysutils/lnav/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	lnav
-DISTVERSION=	0.12.2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.12.3-beta2-62
+DISTVERSIONSUFFIX=	-g1bef9f04
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/tstack/${PORTNAME}/releases/download/v${DISTVERSION}/
+#MASTER_SITES=	https://github.com/tstack/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	tom@hur.st
 COMMENT=	Terminal-based log file navigator
 WWW=		https://lnav.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_FreeBSD_15=	compilation fails with clang-19 but future 0.12.3 will include fix: https://github.com/tstack/lnav/issues/1328
-
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2
 
-USES=		autoreconf compiler:c++14-lang gmake ncurses readline sqlite \
-		tar:bz2
+USES=		autoreconf compiler:c++17-lang gmake ncurses readline sqlite
+USE_GITHUB=	yes
+GH_ACCOUNT=	tstack
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 
 PLIST_FILES=	bin/lnav \
 		share/man/man1/lnav.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/lnav ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/lnav.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/lnav/distinfo b/sysutils/lnav/distinfo
index bcc4e20792f5..cfc4e9e35942 100644
--- a/sysutils/lnav/distinfo
+++ b/sysutils/lnav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714459734
-SHA256 (lnav-0.12.2.tar.bz2) = 5909dbb2249fd23bc675d5a38f328c1829e3d8019818234e276b8af1de99aed6
-SIZE (lnav-0.12.2.tar.bz2) = 3074504
+TIMESTAMP = 1730457265
+SHA256 (tstack-lnav-v0.12.3-beta2-62-g1bef9f04_GH0.tar.gz) = 72f9752a10b4a97e1f420bff5bc52b253278a7ffce33bc6ef860c31af992407c
+SIZE (tstack-lnav-v0.12.3-beta2-62-g1bef9f04_GH0.tar.gz) = 19196480