diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 0bb9d8c31..b8e8cbd8d 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1,2 @@
 DIST lua-language-server-3.5.3.zip 30586495 BLAKE2B 820df06cc21bb1905196172084ac2af7799381a12a6f98fea5c45091e9a1b573c2b25321e919ed173b21966b54cb3161e360717989dfcb24b3f268fee5b497ee SHA512 f5762c2a21e7c58fe1906b2092bbafa5ced9b9b5413db3003e15a3cff6b67e78a102106dbfcb556a8a97a74aff32d8d42b42773862635aed278d162488b63266
+DIST lua-language-server-3.5.4.zip 30638297 BLAKE2B 17e8e9f4aa489d98f3377e12b4306e426cd6552e2d795e3c27578e9d11742dd19fc559f27af429c6a53eb88b9918b07ed34e2179c14f87af14379ca905959cf9 SHA512 7b053badd1b531997e611e363d04c645f574780bc4aeb7f9fa593af46274dbf4a7899c988df156722997b3556e2826eb0320faf2fb5132657481045151f04c5e
diff --git a/dev-util/lua-language-server/lua-language-server-3.5.4.ebuild b/dev-util/lua-language-server/lua-language-server-3.5.4.ebuild
new file mode 100644
index 000000000..0f80eb0df
--- /dev/null
+++ b/dev-util/lua-language-server/lua-language-server-3.5.4.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
+}