diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 48667f2e5..d71acc566 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -59,6 +59,7 @@
 | heex | ✓ | ✓ |  | `elixir-ls` |
 | hosts | ✓ |  |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
+| hurl | ✓ |  | ✓ |  |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
 | ini | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 48c1345c8..c5c69b9b6 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2422,3 +2422,17 @@ language-server = { command = "nimlangserver" }
 [[grammar]]
 name = "nim"
 source = { git = "https://github.com/aMOPel/tree-sitter-nim", rev = "240239b232550e431d67de250d1b5856209e7f06" }
+
+[[language]]
+name = "hurl"
+scope = "source.hurl"
+injection-regex = "hurl"
+file-types = ["hurl"]
+roots = []
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "hurl"
+source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "264c42064b61ee21abe88d0061f29a0523352e22" }
+
diff --git a/runtime/queries/hurl/highlights.scm b/runtime/queries/hurl/highlights.scm
new file mode 100644
index 000000000..c066b2844
--- /dev/null
+++ b/runtime/queries/hurl/highlights.scm
@@ -0,0 +1,127 @@
+[
+  "[QueryStringParams]"
+  "[FormParams]"
+  "[MultipartFormData]"
+  "[Cookies]"
+  "[Captures]"
+  "[Asserts]"
+  "[Options]"
+  "[BasicAuth]"
+] @attribute
+
+(comment) @comment
+
+[
+  (key_string)
+  (json_key_string)
+] @variable.other.member
+ 
+(value_string) @string
+(quoted_string) @string
+(json_string) @string
+(file_value) @string.special.path
+(regex) @string.regex
+
+[
+  "\\"
+  (regex_escaped_char)
+  (quoted_string_escaped_char)
+  (key_string_escaped_char)
+  (value_string_escaped_char)
+  (oneline_string_escaped_char)
+  (multiline_string_escaped_char)
+  (filename_escaped_char)
+  (json_string_escaped_char)
+] @constant.character.escape
+
+(method) @type.builtin
+(multiline_string_type) @type
+
+[
+  "status"
+  "url"
+  "header"
+  "cookie"
+  "body"
+  "xpath"
+  "jsonpath"
+  "regex"
+  "variable"
+  "duration"
+  "sha256"
+  "md5"
+  "bytes"
+] @function.builtin
+
+(filter) @attribute
+
+(version) @string.special
+[
+  "null"
+  "cacert"
+  "location"
+  "insecure"
+  "max-redirs"
+  "retry"
+  "retry-interval"
+  "retry-max-count"
+  (variable_option "variable")
+  "verbose"
+  "very-verbose"
+] @constant.builtin
+
+(boolean) @constant.builtin.boolean
+
+(variable_name) @variable
+
+[
+  "not"
+  "equals"
+  "=="
+  "notEquals"
+  "!="
+  "greaterThan"
+  ">"
+  "greaterThanOrEquals"
+  ">="
+  "lessThan"
+  "<"
+  "lessThanOrEquals"
+  "<="
+  "startsWith"
+  "endsWith"
+  "contains"
+  "matches"
+  "exists"
+  "includes"
+  "isInteger"
+  "isFloat"
+  "isBoolean"
+  "isString"
+  "isCollection"
+] @keyword.operator
+
+(integer) @constant.numeric.integer
+(float) @constant.numeric.float
+(status) @constant.numeric
+(json_number) @constant.numeric.float
+
+[
+  ":"
+  ","
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+  "{{"
+  "}}"
+] @punctuation.special
+
+[
+  "base64,"
+  "file,"
+  "hex,"
+] @string.special
\ No newline at end of file
diff --git a/runtime/queries/hurl/indents.scm b/runtime/queries/hurl/indents.scm
new file mode 100644
index 000000000..d436f76fd
--- /dev/null
+++ b/runtime/queries/hurl/indents.scm
@@ -0,0 +1,11 @@
+[
+  (json_object)
+  (json_array)
+  (xml_tag)
+] @indent
+
+[
+  "}"
+  "]"
+  (xml_close_tag)
+] @outdent
diff --git a/runtime/queries/hurl/injections.scm b/runtime/queries/hurl/injections.scm
new file mode 100644
index 000000000..a0d238173
--- /dev/null
+++ b/runtime/queries/hurl/injections.scm
@@ -0,0 +1,14 @@
+((comment) @injection.content
+ (#set! injection.language "comment"))
+
+((json_value) @injection.content
+  (#set! injection.language "json"))
+
+((xml) @injection.content
+  (#set! injection.language "xml"))
+
+((multiline_string
+  (multiline_string_type) @injection.language
+  (multiline_string_content) @injection.content)
+  (#set! injection.include-children)
+  (#set! injection.combined))