diff --git a/common/shlibs b/common/shlibs
index 1fdd77c9bbe72a..17b7ac6446052b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -380,6 +380,7 @@ libnssckbi.so nss-3.121_1
 libnss3.so nss-3.121_1
 libfreeblpriv3.so nss-3.125_1
 libcurl.so.4 libcurl-7.75.0_2
+libduckdb.so duckdb-1.5.0_1
 libdaemon.so.0 libdaemon-0.14_1
 libavahi-common.so.3 avahi-libs-0.6.25_1
 libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/duckdb/template b/srcpkgs/duckdb/template
index c29443d495021d..3c0877e4d27fb8 100644
--- a/srcpkgs/duckdb/template
+++ b/srcpkgs/duckdb/template
@@ -1,7 +1,7 @@
 # Template file for 'duckdb'
 pkgname=duckdb
 version=1.5.0
-revision=1
+revision=2
 archs="x86_64* aarch64*" # 32-bit FTBFS
 build_style=cmake
 build_helper="python3"
@@ -38,7 +38,7 @@ post_extract() {
 }
 
 post_build() {
-	OVERRIDE_GIT_DESCRIBE="v${version}" CMAKE_EXECUTABLE="${XBPS_MASTERDIR}/usr/bin/cmake" python3 -m build \
+	OVERRIDE_GIT_DESCRIBE="v${version}" CMAKE_EXECUTABLE="${XBPS_MASTERDIR}/usr/bin/cmake" CMAKE_BUILD_PARALLEL_LEVEL="${XBPS_MAKEJOBS}" python3 -m build \
 		--no-isolation --wheel ${_pypkg_wrksrc}
 }
 
@@ -56,7 +56,6 @@ duckdb-devel_package() {
 		vmove usr/include
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
 	}
 }
 
diff --git a/srcpkgs/lua54-luadbi/patches/fix-makefile.patch b/srcpkgs/lua54-luadbi/patches/fix-makefile.patch
new file mode 100644
index 00000000000000..25c259e9f5f5d0
--- /dev/null
+++ b/srcpkgs/lua54-luadbi/patches/fix-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index e0066f6..20ed1b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -140,7 +140,7 @@ install_sqlite3: sqlite3 install_lua
+ 	$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(LUA_CDIR)/$(DBDSQLITE3)
+ 
+ install_duckdb: duckdb install_lua
+-	$(INSTALL_PROGRAM) -D $(DBDDUCKDB) $(DESTDIR)$(LUA_CDIR)/$DBDDUCKDB)
++	$(INSTALL_PROGRAM) -D $(DBDDUCKDB) $(DESTDIR)$(LUA_CDIR)/$(DBDDUCKDB)
+ 
+ install_db2: db2 install_lua
+ 	$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(LUA_CDIR)/$(DBDDB2)
diff --git a/srcpkgs/lua54-luadbi/template b/srcpkgs/lua54-luadbi/template
index ce3edebf58f5ad..f0e3b381dfadf0 100644
--- a/srcpkgs/lua54-luadbi/template
+++ b/srcpkgs/lua54-luadbi/template
@@ -1,98 +1,88 @@
 # Template file for 'lua54-luadbi'
 pkgname=lua54-luadbi
-version=0.5
-revision=5
-create_wrksrc="yes"
+version=0.7.5
+revision=1
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel sqlite-devel
- postgresql-libs-devel libmariadbclient-devel"
+ postgresql-libs-devel libmariadbclient-devel duckdb-devel"
+ depends="lua54"
 _desc="Lua database interface library"
 short_desc="${_desc} (5.4.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="https://code.google.com/archive/p/luadbi/"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.$version.tar.gz"
-checksum=49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e
-
-post_extract() {
-	cd ${wrksrc}
-	mkdir -p lua51
-	mv * lua51 || true
-	cp -a lua51 lua52
-	cp -a lua51 lua53
-	cp -a lua51 lua54
-}
+homepage="https://github.com/mwild1/luadbi"
+distfiles="https://github.com/mwild1/luadbi/archive/refs/tags/v${version}.tar.gz>luadbi-${version}.tar.gz"
+checksum=d11990029946cf29ee33cdb563900ba8e105207c507b08887896e88e429d8429
 
+_lua_vers=("5.1" "5.2" "5.3" "5.4") # Note: This package does not support lua > 5.4, as of version 0.7.5
 _common_cflags="-pedantic -Wall -O2 -shared -fpic -I${XBPS_CROSS_BASE}/usr/include/mysql -I${XBPS_CROSS_BASE}/usr/include/postgresql/server -I."
 
 if [[ -n "${CROSS_BUILD}" ]]; then
 	_common_cflags+=" -I${XBPS_CROSS_BASE}/usr/include"
 fi
 
-do_build() {
-	cd ${wrksrc}/lua51
-	make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.1" ${makejobs} free
-
-	cd ${wrksrc}/lua52
-	make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.2" ${makejobs} free
-
-	cd ${wrksrc}/lua53
-	make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.3" ${makejobs} free
+post_patch() {
+	cd ${wrksrc}
+	_source_files=$(ls)
 
-	cd ${wrksrc}/lua54
-	make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua5.4" ${makejobs} free
-}
+	mkdir lua51
+	mv ${_source_files} lua51
 
-do_install() {
-	cd ${wrksrc}/lua51
-	for lib in *.so; do
-		vinstall ${lib} 755 usr/lib/lua/5.1
+	for ver in ${_lua_vers[@]:1}; do
+		cp -a lua51 "lua${ver/./}"
 	done
-	vinstall DBI.lua 644 usr/share/lua/5.1/
+}
 
-	cd ${wrksrc}/lua52
-	for lib in *.so; do
-		vinstall ${lib} 755 usr/lib/lua/5.2
+do_build() {
+	for ver in ${_lua_vers[@]}; do
+		cd "${wrksrc}/lua${ver/./}"
+		msg_normal "building for lua ${ver}\n"
+		make CC="$CC" AR="$AR" RANLIB="$RANLIB" CFLAGS="${_common_cflags} -I${XBPS_CROSS_BASE}/usr/include/lua${ver}" LUA_V="${ver}" ${makejobs} free
 	done
-	vinstall DBI.lua 644 usr/share/lua/5.2/
+}
 
-	cd ${wrksrc}/lua53
-	for lib in *.so; do
-		vinstall ${lib} 755 usr/lib/lua/5.3
-	done
-	vinstall DBI.lua 644 usr/share/lua/5.3/
+_lua_install() {
+	_ver=$1
+	cd "${wrksrc}/lua${_ver/./}"
+	make install_free DESTDIR="${PKGDESTDIR}" LUA_V="${_ver}"
+	vlicense COPYING
+}
 
-	cd ${wrksrc}/lua54
-	for lib in *.so; do
-		vinstall ${lib} 755 usr/lib/lua/5.4
+do_install() {
+	for ver in ${_lua_vers[@]}; do
+		_lua_install "${ver}"
 	done
-	vinstall DBI.lua 644 usr/share/lua/5.4/
-	vlicense COPYING
 }
 
 lua51-luadbi_package() {
 	short_desc="${_desc} (5.1.x)"
+	depends="lua51"
 	pkg_install() {
-		vmove usr/lib/lua/5.1
-		vmove usr/share/lua/5.1
-		vlicense ${wrksrc}/lua51/COPYING
+		local ver="5.1"
+		vmove "usr/lib/lua/${ver}"
+		vmove "usr/share/lua/${ver}"
+		vlicense "${wrksrc}/lua${ver/./}/COPYING"
 	}
 }
 
 lua52-luadbi_package() {
 	short_desc="${_desc} (5.2.x)"
+	depends="lua52"
 	pkg_install() {
-		vmove usr/lib/lua/5.2
-		vmove usr/share/lua/5.2
-		vlicense ${wrksrc}/lua52/COPYING
+		local ver="5.2"
+		vmove "usr/lib/lua/${ver}"
+		vmove "usr/share/lua/${ver}"
+		vlicense "${wrksrc}/lua${ver/./}/COPYING"
 	}
 }
 
 lua53-luadbi_package() {
 	short_desc="${_desc} (5.3.x)"
+	depends="lua53"
 	pkg_install() {
-		vmove usr/lib/lua/5.3
-		vmove usr/share/lua/5.3
-		vlicense ${wrksrc}/lua53/COPYING
+		local ver="5.3"
+		vmove "usr/lib/lua/${ver}"
+		vmove "usr/share/lua/${ver}"
+		vlicense "${wrksrc}/lua${ver/./}/COPYING"
 	}
 }