diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index e9ef56cf745b7..62d7a04f52fb3 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -112,5 +112,6 @@
 | verilog | ✓ | ✓ |  | `svlangserver` |
 | vue | ✓ |  |  | `vls` |
 | wgsl | ✓ |  |  | `wgsl_analyzer` |
+| xit | ✓ |  |  |  |
 | yaml | ✓ |  | ✓ | `yaml-language-server` |
 | zig | ✓ |  | ✓ | `zls` |
diff --git a/languages.toml b/languages.toml
index 5772be479ca3d..2b56e33229f07 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1493,7 +1493,6 @@ indent = { tab-width = 2, unit = "  " }
 name = "jsdoc"
 source = { git = "https://github.com/tree-sitter/tree-sitter-jsdoc", rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db" }
 
-
 [[language]]
 name = "openscad"
 scope = "source.openscad"
@@ -1653,3 +1652,15 @@ indent = { tab-width = 2, unit = "  " }
 [[grammar]]
 name = "task"
 source = { git = "https://github.com/alexanderbrevig/tree-sitter-task", rev = "f2cb435c5dbf3ee19493e224485d977cb2d36d8b" }
+
+[[language]]
+name = "xit"
+scope = "source.xit"
+injection-regex = "xit"
+file-types = ["xit"]
+roots = []
+indent = { tab-width = 4, unit = "    " }
+
+[[grammar]]
+name = "xit"
+source = { git = "https://github.com/synaptiko/tree-sitter-xit", rev = "7d7902456061bc2ad21c64c44054f67b5515734c" }
diff --git a/runtime/queries/xit/highlights.scm b/runtime/queries/xit/highlights.scm
new file mode 100644
index 0000000000000..c94b89adbf7ff
--- /dev/null
+++ b/runtime/queries/xit/highlights.scm
@@ -0,0 +1,11 @@
+(headline) @markup.heading
+
+(open_checkbox) @markup.list
+(ongoing_checkbox) @keyword.control
+(checked_checkbox) @diff.plus
+(obsolete_checkbox) @comment.unused
+
+(checked_task) @comment.unused
+(obsolete_task) @comment.unused
+
+(priority) @error