diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 6efc40318d6d..83b1f791d5fb 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -1,50 +1,45 @@
 PORTNAME=	lutok
-DISTVERSION=	0.5
+DISTVERSION=	0.6.1
 CATEGORIES=	devel
-MASTER_SITES=https://github.com/freebsd/${PORTNAME}/releases/download/${DISTNAME}/
+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
 
-BUILD_DEPENDS=	atf>=0.21:devel/atf
-RUN_DEPENDS=	atf>=0.21:devel/atf
-
 USES=		autoreconf libtool lua pathfix pkgconfig
-USE_CXXSTD=	gnu++11
+USE_CXXSTD=	gnu++14
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-#TEST_CONFIGURE_WITH=	atf
-# Force the use of the lua version we have chosen via USE_LUA.  If we allow
-# lutok's configure script search for one using pkgconfig files, it might pick
-# a different version.
 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
 
-NO_WRKSUBDIR=	yes
-
-PORTDOCS=	AUTHORS COPYING NEWS.md README.md html/*
+PORTDOCS=	AUTHORS COPYING NEWS README.md html/*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFAULT= DOCS EXAMPLES TEST
+OPTIONS_DEFINE=	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
 
 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 c11965eebe08..179a6829f0f5 100644
--- a/devel/lutok/distinfo
+++ b/devel/lutok/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732984939
-SHA256 (lutok-0.5.tar.gz) = 9cdc3cf08babec6e70a96a907d82f8b34eac866dd7196abc73b95d5e13701f55
-SIZE (lutok-0.5.tar.gz) = 4075008
+TIMESTAMP = 1743276420
+SHA256 (lutok-0.6.1.tar.gz) = 509c43c240ba47b8c452b45f3423a416fa91bdfc0341bfb806e0b78f65ce452d
+SIZE (lutok-0.6.1.tar.gz) = 648933
diff --git a/devel/lutok/pkg-plist b/devel/lutok/pkg-plist
index 693f0e866424..0f1665afb7cc 100644
--- a/devel/lutok/pkg-plist
+++ b/devel/lutok/pkg-plist
@@ -1,26 +1,26 @@
 include/lutok/c_gate.hpp
 include/lutok/debug.hpp
 include/lutok/exceptions.hpp
 include/lutok/operations.hpp
 include/lutok/stack_cleaner.hpp
 include/lutok/state.hpp
 include/lutok/state.ipp
 include/lutok/test_utils.hpp
 lib/liblutok.a
 lib/liblutok.so
 lib/liblutok.so.3
 lib/liblutok.so.3.0.0
 libdata/pkgconfig/lutok.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bindings.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/interpreter.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/raii.cpp
-tests/lutok/Kyuafile
-tests/lutok/c_gate_test
-tests/lutok/debug_test
-tests/lutok/examples_test
-tests/lutok/exceptions_test
-tests/lutok/operations_test
-tests/lutok/stack_cleaner_test
-tests/lutok/state_test
+%%TEST%%tests/lutok/Kyuafile
+%%TEST%%tests/lutok/c_gate_test
+%%TEST%%tests/lutok/debug_test
+%%TEST%%tests/lutok/examples_test
+%%TEST%%tests/lutok/exceptions_test
+%%TEST%%tests/lutok/operations_test
+%%TEST%%tests/lutok/stack_cleaner_test
+%%TEST%%tests/lutok/state_test