diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index a66fae211a6c3..88c9df91484fc 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -53,6 +53,7 @@
 | javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
 | jsdoc | ✓ |  |  |  |
 | json | ✓ |  | ✓ | `vscode-json-language-server` |
+| jsonnet | ✓ |  |  |  |
 | jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
 | julia | ✓ |  |  | `julia` |
 | kotlin | ✓ |  |  | `kotlin-language-server` |
diff --git a/languages.toml b/languages.toml
index e7ce63edf4e04..af9d895aa0327 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1791,3 +1791,15 @@ roots = []
 [[grammar]]
 name = "sml"
 source = { git = "https://github.com/Giorbo/tree-sitter-sml", rev = "bd4055d5554614520d4a0706b34dc0c317c6b608" }
+
+[[language]]
+name = "jsonnet"
+scope = "source.jsonnet"
+file-types = ["libsonnet", "jsonnet"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "jsonnet"
+source = { git = "https://github.com/sourcegraph/tree-sitter-jsonnet", rev = "0475a5017ad7dc84845d1d33187f2321abcb261d" }
diff --git a/runtime/queries/jsonnet/highlights.scm b/runtime/queries/jsonnet/highlights.scm
new file mode 100644
index 0000000000000..f54e7d5c74dec
--- /dev/null
+++ b/runtime/queries/jsonnet/highlights.scm
@@ -0,0 +1,38 @@
+["if" "then" "else"] @keyword.control.conditional
+[
+  (local)
+  "function"
+] @keyword
+(comment) @comment
+
+(string) @string
+(number) @constant.numeric
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
+
+(binaryop) @operator
+(unaryop) @operator
+
+(param identifier: (id) @variable.parameter)
+(bind function: (id) @function)
+(fieldname (id) @variable.other.member)
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+"for" @keyword.control.repeat
+"in" @keyword.operator
+[(self) (dollar)] @variable.builtin
+"assert" @keyword
+(null) @constant.builtin
+[
+  ":"
+  "::"
+  ";"
+  "="
+] @punctuation.delimiter
+(id) @variable