diff --git a/databases/lua-lsqlite3/Makefile b/databases/lua-lsqlite3/Makefile
index 68e481174feb..4952b334b159 100644
--- a/databases/lua-lsqlite3/Makefile
+++ b/databases/lua-lsqlite3/Makefile
@@ -1,56 +1,61 @@
 PORTNAME=	lsqlite3
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+DISTVERSION=	0.9.6
 CATEGORIES=	databases
-MASTER_SITES=	http://Lua.SQLite.org/index.cgi/zip/
+MASTER_SITES=	https://lua.sqlite.org/home/zip/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}_fsl09y
+DISTNAME=	${PORTNAME}_v${DISTVERSION:C/\.//g}
 
 MAINTAINER=	yds@Necessitu.de
 COMMENT=	Lua wrapper for SQLite3 library
 WWW=		http://Lua.SQLite.org/index.cgi/doc/tip/doc/lsqlite3.wiki
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${NONEXISTENT}:databases/sqlite3:build
+TEST_DEPENDS=	${LUA_FLAVOR}-lunitx>0:devel/lua-lunitx
 
 USES=		localbase:ldflags sqlite:3 zip lua:module
 
+TEST_TARGET=	test
+
 CFLAGS+=	-pedantic -Wall -Qunused-arguments -fPIC -DPIC\
 		-std=c99 -fno-strict-aliasing -I${LUA_INCDIR}\
-		-DLSQLITE_VERSION=\"${PORTVERSION}\"
+		-DLSQLITE_VERSION=\"${DISTVERSION}\"
 LDFLAGS+=	-shared -pthread -lm -L${LOCALBASE}/lib
 
 DOCSDIR=	${LUA_DOCSDIR}
 EXAMPLESDIR=	${LUA_EXAMPLESDIR}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+post-patch:
+	@${REINPLACE_CMD} 's|LUAEXE=.*|LUAEXE= ${LUA_CMD}|' ${WRKSRC}/Makefile
+
 pre-configure:
 	@${CP} -p `${SETENV} -u FLAVOR ${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} &&\
 		${CC} ${CFLAGS} ${LDFLAGS} -lsqlite3\
 		-o ${PORTNAME}.so ${PORTNAME}.c
 	cd ${WRKSRC} &&\
 		${CC} ${CFLAGS} ${LDFLAGS}\
 		-I. -Dluaopen_lsqlite3=luaopen_lsqlite3complete\
 		-o ${PORTNAME}complete.so ${PORTNAME}.c sqlite3.c
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}.so ${STAGEDIR}${LUA_MODLIBDIR}
 	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}complete.so ${STAGEDIR}${LUA_MODLIBDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.wiki ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/HISTORY ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.lua ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/lua-lsqlite3/distinfo b/databases/lua-lsqlite3/distinfo
index 694d839ffc22..3ab07c66a6d6 100644
--- a/databases/lua-lsqlite3/distinfo
+++ b/databases/lua-lsqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631022697
-SHA256 (lsqlite3_fsl09y.zip) = 4c1415c6169ceedfef55888db5bd081dadc154a868c07ad2a06e75825be21d94
-SIZE (lsqlite3_fsl09y.zip) = 2124170
+TIMESTAMP = 1712413660
+SHA256 (lsqlite3_v096.zip) = 09c826da84f470d97b350a85308f1b6f8523b25fccc8f98110c0b9fbca211a09
+SIZE (lsqlite3_v096.zip) = 2124172
diff --git a/databases/lua-lsqlite3/files/patch-test_tests-sqlite3.lua b/databases/lua-lsqlite3/files/patch-test_tests-sqlite3.lua
new file mode 100644
index 000000000000..bc2aa55c2a15
--- /dev/null
+++ b/databases/lua-lsqlite3/files/patch-test_tests-sqlite3.lua
@@ -0,0 +1,11 @@
+--- test/tests-sqlite3.lua.orig	2024-03-27 05:11:12 UTC
++++ test/tests-sqlite3.lua
+@@ -1114,7 +1114,7 @@ function colla.test()
+     --  print(row.id,row.content)
+     --end
+     local n = 0
+-    for row in colla.db:nrows('SELECT * FROM test WHERE content="hElLo wOrLd"') do
++    for row in colla.db:nrows("SELECT * FROM test WHERE content='hElLo wOrLd'") do
+       -- print(row.id,row.content)
+       assert_equal (row.content:lower(), "hello world")
+       n = n + 1