diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 0fb78ec967..5b9cac2443 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,3 +1,4 @@
 DIST lua-language-server-3.15.0.zip 31509845 BLAKE2B 1ee07166d37e30f9832aba43b45bfc40eb5bfe26e12a3e29be7b307191f72b786ce82e7b245c640c8f1ff7c2debcf8bcd32eecb8613bfef9337f947747300022 SHA512 b7b270b4439dc7154b4cd47d0ecf95d4d9251225abc527bb3f6a99157ff0784902088f3436dc455b083b7c090d97267221ed407720c85b2ac163c3666dabe72c
 DIST lua-language-server-3.16.0.zip 31962898 BLAKE2B ab6a8dfe59f4856c1c0a1d56f953296515e4ca7242cce89c7a7c9898bdfaf5af9b5a214f054e6c3f85c653f6d7ca02bf0356ea5a9893b161fc25903bfe610afd SHA512 fa9c9020c8453c5ddd9a46388dd55ae5cd4e7787b0c1aa58c493b6135f7f2f1bc152976e0b260d44da12f7b95838cfb84026ad422a55319ef84fba258dcc414b
 DIST lua-language-server-3.16.1.zip 31995002 BLAKE2B 2c51f7b7cbefc96230d61ac23925521d284ef9875346cad4f5bc3a2ad499393925687eda8057c13ed4279fff03f2ac1d82d3f261d4287d45f40a9791542506a0 SHA512 0fd267ceb35284a7d300af2c1c464ffd6cb2e1fe3945ea936fe5e2316af52838ada4eb9b018a6bb396e95f9eac27e00309d7ed51a7f4bc34529077c3438234cf
+DIST lua-language-server-3.16.4.zip 32006835 BLAKE2B 84f4288b59b724a1332a10da03fd677d41a6062be9a0cb2f2f1f63cb4debca7332ec4d05a2b4b7b8969f18c9737c7c1b5b8d22e00688ec17cce8c9e414ec3533 SHA512 0787e5e2e5149e8a9df8e438b7e63cd55b6354f7fd6cc1cbd13b53df2efd4d185b64bb0fc25baf6800c7075e9f3e7c4826e619ab0786120e40e62679a531c332
diff --git a/dev-util/lua-language-server/files/3.16.4-build.ninja.patch b/dev-util/lua-language-server/files/3.16.4-build.ninja.patch
new file mode 100644
index 0000000000..54060cc541
--- /dev/null
+++ b/dev-util/lua-language-server/files/3.16.4-build.ninja.patch
@@ -0,0 +1,102 @@
+--- a/build/build.ninja
++++ b/build/build.ninja
+@@ -12,14 +12,14 @@ rule configure
+ rule c_source_lua
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+     -I3rd/bee.lua/3rd/lua55 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $
+-    $out -c $in
++    $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua55/onelua.c
+ rule cxx_source_bee
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -27,7 +27,7 @@ build $obj/source_bee/lua-seri.obj: cxx_source_bee $
+     3rd/bee.lua/3rd/lua-seri/lua-seri.cpp
+ rule cxx_source_bee_1
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -36,7 +36,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 $
+ rule cxx_source_bee_2
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DNDEBUG $
+-    -fPIC -o $out -c $in
++    -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -84,7 +84,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_2 $
+ rule c_source_bee
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DBEE_STATIC $
+-    -DNDEBUG -fPIC -o $out -c $in
++    -DNDEBUG -fPIC -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+@@ -128,7 +128,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_3 $
+ rule cxx_source_bootstrap
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 $
+-    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
++    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -138,7 +138,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+     3rd/bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+   command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
+-    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+   description = Link    Exe $out
+ rule copy
+   command = cp -fv $in$input $out 1>/dev/null
+@@ -153,8 +153,8 @@ rule cxx_code_format
+     -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
+     -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
+     -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua54 $
+-    -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $
+-    $out -c $in
++    -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $
++    $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -259,7 +259,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
+ rule c_lpeglabel
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua/3rd/lua55 -DMAXRECLEVEL=1000 -DNDEBUG $
+-    -o $out -c $in
++    -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+@@ -271,7 +271,7 @@ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
+ rule cxx_lua_language_server
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua55 -DCODE_FORMAT $
+-    -DNDEBUG -o $out -c $in
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -279,7 +279,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
+     make/modules.cpp
+ rule link_lua_language_server
+   command = $cc $in -o $out -rdynamic -lstdc++fs -pthread -lm -ldl $
+-    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+   description = Link    Exe $out
+ rule run_bee_test
+   command = $bin/lua-language-server $in
diff --git a/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch b/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch
new file mode 100644
index 0000000000..4b31502884
--- /dev/null
+++ b/dev-util/lua-language-server/files/3.16.4-linux.ninja.patch
@@ -0,0 +1,63 @@
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
+@@ -2,20 +2,20 @@ ninja_required_version = 1.7
+ builddir = build/linux
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = gcc
+-ar = ar
++cc = REPLACE_ME
++ar = REPLACE_AR
+ luamake = luamake
+ rule c_source_lua
+   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+     -Ibee.lua/3rd/lua55 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out $
+     -c $in
+-  description = Compile C   $out
++  description = Compile C   $out CFLAGS
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_lua/onelua.obj: c_source_lua bee.lua/3rd/lua55/onelua.c
+ rule cxx_source_bee
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -Ibee.lua/3rd/lua55 -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -Ibee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -23,7 +23,7 @@ build $obj/source_bee/lua-seri.obj: cxx_source_bee $
+     bee.lua/3rd/lua-seri/lua-seri.cpp
+ rule cxx_source_bee_1
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+-    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -31,7 +31,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 bee.lua/3rd/fmt/format.cc
+ rule cxx_source_bee_2
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -Ibee.lua -Ibee.lua/3rd/lua55 -DNDEBUG -fPIC -o $
+-    $out -c $in
++    $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -119,7 +119,7 @@ rule cxx_source_bootstrap
+   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+     -fvisibility=hidden -Ibee.lua -Ibee.lua/3rd/lua55 -DLUA_USE_LINUX $
+     -DNDEBUG -fPIC -o $out -c $in
+-  description = Compile C++ $out
++  description = Compile C++ $out CXXFLAGS
+   deps = gcc
+   depfile = $out.d
+ build $obj/source_bootstrap/bootstrap_init.obj: cxx_source_bootstrap $
+@@ -128,7 +128,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+     bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+   command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
+-    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
+   description = Link    Exe $out
+ rule copy
+   command = cp -fv $in$input $out 1>/dev/null
diff --git a/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild b/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
new file mode 100644
index 0000000000..9f9be2f484
--- /dev/null
+++ b/dev-util/lua-language-server/lua-language-server-3.16.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua{5-{1,3,4},jit} )
+
+inherit ninja-utils toolchain-funcs lua-single prefix
+
+DESCRIPTION="Lua language server"
+HOMEPAGE="https://github.com/LuaLS/lua-language-server"
+SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="llvm-libunwind test"
+REQUIRE_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+	${LUA_DEPS}
+	sys-libs/binutils-libs
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-alternatives/ninja
+	app-arch/unzip
+	!llvm-libunwind? ( sys-libs/libunwind )
+	llvm-libunwind? ( llvm-runtimes/libunwind )
+"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# Remove hardcoded gcc references
+	sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
+		make.lua || die
+	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
+		3rd/lpeglabel/makefile || die
+	# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
+	eapply "${FILESDIR}/3.16.4-linux.ninja.patch"
+	eapply_user
+	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+		-e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		3rd/luamake/compile/ninja/linux.ninja || die
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		sed -i "s/-lstdc++fs//" 3rd/luamake/compile/ninja/linux.ninja || die
+	fi
+
+	prefixify_ro "${FILESDIR}/wrapper.sh"
+}
+
+src_compile() {
+	eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
+	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
+	./3rd/luamake/luamake init || die
+
+	# Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
+	sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
+		-e "s/^ar =.*./ar = REPLACE_AR/" \
+		build/build.ninja || die
+
+	eapply "${FILESDIR}/${PV}-build.ninja.patch"
+	sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
+		-e "s/REPLACE_AR/$(tc-getAR)/" \
+		-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		build/build.ninja || die
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		sed -i "s/-lstdc++fs//" build/build.ninja || die
+	fi
+
+	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
+	rm -rf meta/198256b1
+}
+
+src_install() {
+	newbin "${T}/wrapper.sh" ${PN}
+
+	into /opt/${PN}
+	dobin bin/${PN}
+
+	insinto /opt/${PN}/bin
+	doins bin/main.lua
+
+	insinto /opt/${PN}
+	doins -r debugger.lua main.lua locale meta script
+
+	einstalldocs
+}