diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-bash_0.25.1.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-bash_0.25.1.bb
new file mode 100644
index 0000000000..ead1e3162e
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-bash_0.25.1.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2220463fa5825d0a3935ade6f38bdd69"
+
+SRC_URI = "git://github.com/tree-sitter/tree-sitter-bash.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "a06c2e4415e9bc0346c6b86d401879ffb44058f7"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-bitbake_1.1.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-bitbake_1.1.0.bb
new file mode 100644
index 0000000000..34b86f8116
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-bitbake_1.1.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7dcf1d5ba61a94226e43f0705d73c97d"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-bitbake.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "10bacac929ff36a1e8f4056503fe4f8717b21b94"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-c_0.24.2.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-c_0.24.2.bb
new file mode 100644
index 0000000000..4a6ecde3fc
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-c_0.24.2.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=52adf5c4bb8fe6703ee211cd5415e4f6"
+
+SRC_URI = "git://github.com/tree-sitter/tree-sitter-c.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "b780e47fc780ddc8da13afa35a3f4ed5c157823d"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-cmake_0.7.6.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-cmake_0.7.6.bb
new file mode 100644
index 0000000000..5bd346007d
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-cmake_0.7.6.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=890ca54f377bbd88baa2280077889dae"
+
+SRC_URI = "git://github.com/uyha/tree-sitter-cmake.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "a3ec2b2144daf7132e7ee824d8cab9610523d10f"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-cpp_0.23.4.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-cpp_0.23.4.bb
new file mode 100644
index 0000000000..7f87430e7e
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-cpp_0.23.4.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=52adf5c4bb8fe6703ee211cd5415e4f6"
+
+SRC_URI = "git://github.com/tree-sitter/tree-sitter-cpp.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "f41e1a044c8a84ea9fa8577fdd2eab92ec96de02"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-diff_0.2.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-diff_0.2.0.bb
new file mode 100644
index 0000000000..4c6378910c
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-diff_0.2.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4f8e906e7514a0d414eec27d5ecb46ed"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-diff.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "ada384ac7bfc1307f32de474620120add29998fb"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-grammar.inc b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-grammar.inc
new file mode 100644
index 0000000000..bed10934f4
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-grammar.inc
@@ -0,0 +1,44 @@
+SUMMARY ?= "Tree-sitter grammar for ${TS_LANG}"
+HOMEPAGE ?= "https://tree-sitter.github.io/tree-sitter/"
+SECTION = "devel"
+
+TS_LANG ?= "${@d.getVar('BPN').replace('tree-sitter-', '', 1)}"
+TS_PARSERS ?= "${TS_LANG}:."
+
+DEPENDS = "libtreesitter"
+
+do_configure[noexec] = "1"
+
+do_compile() {
+    for entry in ${TS_PARSERS}; do
+        lang=${entry%%:*}
+        dir=${S}/${entry#*:}
+        ${CC} ${CFLAGS} -std=gnu11 -fPIC -I${dir}/src ${LDFLAGS} -shared \
+            -Wl,-soname,libtree-sitter-${lang}.so \
+            -o ${B}/libtree-sitter-${lang}.so ${dir}/src/*.c
+    done
+}
+
+do_install() {
+    install -d ${D}${libdir}/nvim/parser
+    for entry in ${TS_PARSERS}; do
+        lang=${entry%%:*}
+        dir=${S}/${entry#*:}
+        install -m 0755 ${B}/libtree-sitter-${lang}.so ${D}${libdir}/
+        ln -sf ../../libtree-sitter-${lang}.so ${D}${libdir}/nvim/parser/${lang}.so
+        queries=${dir}/queries
+        [ ! -d ${queries}/${lang} ] || queries=${queries}/${lang}
+        if [ -d ${queries} ]; then
+            install -d ${D}${datadir}/tree-sitter/queries/${lang}
+            install -m 0644 ${queries}/*.scm ${D}${datadir}/tree-sitter/queries/${lang}/
+        fi
+    done
+}
+
+FILES_SOLIBSDEV = ""
+FILES:${PN} = " \
+    ${libdir}/libtree-sitter-*.so \
+    ${libdir}/nvim/parser \
+    ${datadir}/tree-sitter \
+"
+INSANE_SKIP:${PN} = "dev-so"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-json_0.24.8.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-json_0.24.8.bb
new file mode 100644
index 0000000000..731a6de7d9
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-json_0.24.8.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=52adf5c4bb8fe6703ee211cd5415e4f6"
+
+SRC_URI = "git://github.com/tree-sitter/tree-sitter-json.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "ee35a6ebefcef0c5c416c0d1ccec7370cfca5a24"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-lua_0.5.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-lua_0.5.0.bb
new file mode 100644
index 0000000000..eff5973f73
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-lua_0.5.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=aab6641082436ddc4655e6b43dc9fe98"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-lua.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "10fe0054734eec83049514ea2e718b2a56acd0c9"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-make_1.1.1.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-make_1.1.1.bb
new file mode 100644
index 0000000000..527a72bec8
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-make_1.1.1.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1519ffdf2ebaba430e2c4f27f95ab17c"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-make.git;protocol=https;branch=main;tag=v${PV}"
+SRCREV = "5e9e8f8ff3387b0edcaa90f46ddf3629f4cfeb1d"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-markdown_0.5.4.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-markdown_0.5.4.bb
new file mode 100644
index 0000000000..705a1a8a98
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-markdown_0.5.4.bb
@@ -0,0 +1,9 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f7314d574b0c64fe08b05298f291b604"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-markdown.git;protocol=https;branch=split_parser;tag=v${PV}"
+SRCREV = "41ff24a6c775492c543b09228aeb98d1cd2b3a0f"
+
+TS_PARSERS = "markdown:tree-sitter-markdown markdown_inline:tree-sitter-markdown-inline"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-meson_1.3.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-meson_1.3.0.bb
new file mode 100644
index 0000000000..33806238b3
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-meson_1.3.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2375704453b348c6c8b93af2d6f83ef8"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-meson.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "12edaf0dfef0a43bc74336a4432b2db1c65788d6"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-python_0.25.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-python_0.25.0.bb
new file mode 100644
index 0000000000..f2bfdb6320
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-python_0.25.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c191fd97f3c9e58e623af9aa4cf2998c"
+
+SRC_URI = "git://github.com/tree-sitter/tree-sitter-python.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "293fdc02038ee2bf0e2e206711b69c90ac0d413f"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-query_0.8.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-query_0.8.0.bb
new file mode 100644
index 0000000000..4e42bf04f5
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-query_0.8.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-query.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "a225e21d81201be77da58de614e2b7851735677a"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-rust_0.24.2.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-rust_0.24.2.bb
new file mode 100644
index 0000000000..b0b180ca28
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-rust_0.24.2.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ac1623bd8a20876e47103c894fd8808a"
+
+SRC_URI = "git://github.com/tree-sitter/tree-sitter-rust.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "77a3747266f4d621d0757825e6b11edcbf991ca5"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-toml_0.7.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-toml_0.7.0.bb
new file mode 100644
index 0000000000..5c0097db96
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-toml_0.7.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fc925cbf1bb87ecaeedbcdc573fc7651"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-toml.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "64b56832c2cffe41758f28e05c756a3a98d16f41"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-vim_0.8.1.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-vim_0.8.1.bb
new file mode 100644
index 0000000000..b0286be035
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-vim_0.8.1.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=46ca08e8c14dc63f12300d0de691980b"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-vim.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "3092fcd99eb87bbd0fc434aa03650ba58bd5b43b"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-vimdoc_4.3.0.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-vimdoc_4.3.0.bb
new file mode 100644
index 0000000000..980d30dcfd
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-vimdoc_4.3.0.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+
+SRC_URI = "git://github.com/neovim/tree-sitter-vimdoc.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "13add92d357b69646c080a8028b82ffb106faf7a"
diff --git a/meta-oe/recipes-devtools/tree-sitter/tree-sitter-yaml_0.7.2.bb b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-yaml_0.7.2.bb
new file mode 100644
index 0000000000..b23932e8e4
--- /dev/null
+++ b/meta-oe/recipes-devtools/tree-sitter/tree-sitter-yaml_0.7.2.bb
@@ -0,0 +1,7 @@
+require tree-sitter-grammar.inc
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=92d9c25147972986a42a9bdc1886746c"
+
+SRC_URI = "git://github.com/tree-sitter-grammars/tree-sitter-yaml.git;protocol=https;branch=master;tag=v${PV}"
+SRCREV = "7708026449bed86239b1cd5bce6e3c34dbca6415"
