diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 8a945150a3c7..6efc40318d6d 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -1,53 +1,50 @@
 PORTNAME=	lutok
-DISTVERSIONPREFIX=	${PORTNAME}-
-DISTVERSION=	0.4
-PORTREVISION=	9
+DISTVERSION=	0.5
 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/jmmv/lutok/
+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_GITHUB=	yes
-GH_ACCOUNT=	freebsd
 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}
-#		pkgconfigdir=${PREFIX}/libdata/pkgconfig
-
 INSTALL_TARGET=	install-strip
 
-PORTDOCS=	AUTHORS COPYING NEWS README html/*
+NO_WRKSUBDIR=	yes
+
+PORTDOCS=	AUTHORS COPYING NEWS.md README.md html/*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 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=
 
 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 26471620e9f0..c11965eebe08 100644
--- a/devel/lutok/distinfo
+++ b/devel/lutok/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704256837
-SHA256 (freebsd-lutok-lutok-0.4_GH0.tar.gz) = 475da420c75a566533f8763ee161525a533cf976f1901f089796bb867953098f
-SIZE (freebsd-lutok-lutok-0.4_GH0.tar.gz) = 37561
+TIMESTAMP = 1732984939
+SHA256 (lutok-0.5.tar.gz) = 9cdc3cf08babec6e70a96a907d82f8b34eac866dd7196abc73b95d5e13701f55
+SIZE (lutok-0.5.tar.gz) = 4075008
diff --git a/devel/lutok/files/patch-state.cpp b/devel/lutok/files/patch-state.cpp
deleted file mode 100644
index afcdd5b59277..000000000000
--- a/devel/lutok/files/patch-state.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- state.cpp.orig	2019-04-22 05:13:10 UTC
-+++ state.cpp
-@@ -492,7 +492,7 @@ lutok::state::is_userdata(const int inde
- void
- lutok::state::load_file(const std::string& file)
- {
--    if (!::access(file.c_str(), R_OK) == 0)
-+    if (::access(file.c_str(), R_OK) == -1)
-         throw lutok::file_not_found_error(file);
-     if (luaL_loadfile(_pimpl->lua_state, file.c_str()) != 0)
-         throw lutok::api_error::from_stack(*this, "luaL_loadfile");