diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index e02e1a0..ed0a921 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,2 +1,3 @@
 DIST lua-language-server-3.6.7.zip 32326158 BLAKE2B 9a83a23c280cd4610396ac67501d19f557dd5d5eb8018a5a48a01c6f699d9e6ad90f87cb9eabd605c921793e5cd3625a67069a792813a2e562a8a0693344d112 SHA512 033f352581dd2f94bf5df13e1ba861e15dc75246e9bf4668700cc700d98e82ebc3593b8f0fcbcd69dbef472fd6dbb84704d8a0068832832c3241a824ca9dca51
 DIST lua-language-server-3.6.8.zip 389244327 BLAKE2B 67299716586bd01f2fc48319b68319b48090b87d8f4c72b79c52022af39140490983edfd1145d88616c1fabcb7f6a62bed8defbab7a8f4fe3330176812994a58 SHA512 bf5633e7570fa44d62bb5a2e4414d4f0e197fcef3b1a9876ea90cf37a79ae17afaaecdc5d54917cc7fb44e01b7db34abd6329cef0df4e3207177a0a6a8ec54f2
+DIST lua-language-server-3.6.9.zip 389246217 BLAKE2B 33154ef90005e081767fa28b74548bc9a8b56c19c2ae8eefa12d9a9ff1611d5d0e43a3de69236d2228a4875e6ed50e770df038ff3fd0fc79b79cfe078479cf7f SHA512 99aad398e3977288dcd4a1952c3feed8c83da779bba4f4b8f1e7984b5c8b9fe937e76a7d69a3958c2839719a0464596c559bfaf47ce2424eea8c2f2f100446ef
diff --git a/dev-util/lua-language-server/lua-language-server-3.6.9.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.9.ebuild
new file mode 100644
index 0000000..0f80eb0
--- /dev/null
+++ b/dev-util/lua-language-server/lua-language-server-3.6.9.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: unbundle deps, set flags correctly, verbose luamake, less sed hacks
+
+EAPI=8
+
+LUA_COMPAT=( lua{5-{1,3,4},jit} )
+
+inherit lua-single ninja-utils prefix toolchain-funcs
+
+DESCRIPTION="A language server that offers Lua language support"
+HOMEPAGE="https://github.com/sumneko/lua-language-server"
+SRC_URI="https://github.com/sumneko/${PN}/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-util/ninja
+"
+
+QA_PREBUILT="/opt/lua-language-server/bin/lua-language-server"
+
+src_prepare() {
+	sed -i "s/^cc = gcc$/cc = $(tc-getCC)/" \
+		3rd/luamake/compile/ninja/linux.ninja || die
+	sed -i "/require \"make.detect_platform\"/a lm.cc = '$(tc-getCC)'" \
+		make.lua || die
+	sed -i "s/flags = \"-Wall -Werror\"/flags = \"-Wall ${CXXFLAGS}\"/" \
+		make/code_format.lua || die
+
+	prefixify_ro "${FILESDIR}"/wrapper.sh
+
+	default
+}
+
+src_compile() {
+	eninja -C 3rd/luamake -f compile/ninja/linux.ninja $(usex test '' 'luamake')
+	./3rd/luamake/luamake $(usex test '' 'all') || die
+}
+
+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
+}