diff --git a/dev-util/cmake-language-server/Manifest b/dev-util/cmake-language-server/Manifest
new file mode 100644
index 0000000..83dd91a
--- /dev/null
+++ b/dev-util/cmake-language-server/Manifest
@@ -0,0 +1 @@
+DIST cmake-language-server-0.1.6.tar.gz 19605 BLAKE2B 08d2954041b145b4a23458fe9a5e6f1841e235d1028a30497093e82cb47e6f0e1762c8e11254a1c060d6864185b96238dffbd0f2e68870ec2dd13a7abb7b82ba SHA512 e52517559ac5d9b236c24db146ccdf9c59858bbb73939aa2e1c0a02b7f2b54ffa0227e71e7c2c0c5aacac73ef45c53f13db94e610ecd2de5775de9c00007431f
diff --git a/dev-util/cmake-language-server/cmake-language-server-0.1.6.ebuild b/dev-util/cmake-language-server/cmake-language-server-0.1.6.ebuild
new file mode 100644
index 0000000..bf5412e
--- /dev/null
+++ b/dev-util/cmake-language-server/cmake-language-server-0.1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1
+
+distutils_enable_tests pytest
+
+DESCRIPTION="CMake LSP Implementation"
+HOMEPAGE="https://github.com/regen100/cmake-language-server"
+SRC_URI="https://github.com/regen100/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/pygls-0.12[${PYTHON_USEDEP}]
+		dev-util/cmakelang[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-util/cmake
+	dev-util/cmakelang
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest-datadir[${PYTHON_USEDEP}]')
+	)
+"
diff --git a/dev-util/cmake-language-server/metadata.xml b/dev-util/cmake-language-server/metadata.xml
new file mode 100644
index 0000000..5533c93
--- /dev/null
+++ b/dev-util/cmake-language-server/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+</pkgmetadata>