diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 83b1f791d5fb..f97edaac56de 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	lutok
-DISTVERSION=	0.6.1
+DISTVERSION=	0.6.2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/freebsd/${PORTNAME}/releases/download/${DISTNAME}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Lightweight C++ API for Lua
 WWW=		https://github.com/freebsd/lutok/
 
 LICENSE=	BSD3CLAUSE
 
-USES=		autoreconf libtool lua pathfix pkgconfig
-USE_CXXSTD=	gnu++14
+USES=		autoreconf compiler:c++20-lang libtool lua pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	LUA_CFLAGS="-I${LUA_INCDIR}"
 CONFIGURE_ARGS+=	LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
 
 MAKE_FLAGS+=	examplesdir=${EXAMPLESDIR}
 INSTALL_TARGET=	install-strip
 
 PORTDOCS=	AUTHORS COPYING NEWS README.md html/*
 
-OPTIONS_DEFAULT= DOCS EXAMPLES TEST
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
+OPTIONS_DEFAULT= DOCS EXAMPLES TEST
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen
 DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR} --htmldir=${DOCSDIR}/html
 DOCS_CONFIGURE_OFF=	--without-doxygen
 DOCS_MAKE_ARGS_OFF=	doc_DATA=
 EXAMPLES_MAKE_ARGS_OFF=	dist_examples_DATA=
-TEST_CONFIGURE_ENABLE=	atf
 TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
 TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
+TEST_CONFIGURE_ENABLE=	atf
 
 pre-install-DOCS-off:
 	@${RM} -r ${WRKSRC}/api-docs
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/api-docs && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/lutok/distinfo b/devel/lutok/distinfo
index 179a6829f0f5..0169ba0680b8 100644
--- a/devel/lutok/distinfo
+++ b/devel/lutok/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743276420
-SHA256 (lutok-0.6.1.tar.gz) = 509c43c240ba47b8c452b45f3423a416fa91bdfc0341bfb806e0b78f65ce452d
-SIZE (lutok-0.6.1.tar.gz) = 648933
+TIMESTAMP = 1778902486
+SHA256 (lutok-0.6.2.tar.gz) = 1ef51f3741d28e27b09dfaee61ab432966cff56f50940eca1cbacffc11baa2ad
+SIZE (lutok-0.6.2.tar.gz) = 619848