diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index b1fde0016abb9..75b5ece2dc501 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -52,6 +52,7 @@
 | haskell | ✓ |  |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
 | heex | ✓ | ✓ |  | `elixir-ls` |
+| hosts | ✓ |  |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 4eb8a4dab1d5d..cc5dec1755cad 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1994,3 +1994,14 @@ grammar = "qmljs"
 [[grammar]]
 name = "qmljs"
 source = { git = "https://github.com/yuja/tree-sitter-qmljs", rev = "0b2b25bcaa7d4925d5f0dda16f6a99c588a437f1" }
+
+[[language]]
+name = "hosts"
+scope = "source.hosts"
+file-types = ["hosts"]
+roots = []
+grammar = "hosts"
+
+[[grammar]]
+name = "hosts"
+source = { git = "https://github.com/ath3/tree-sitter-hosts", rev = "301b9379ce7dfc8bdbe2c2699a6887dcb73953f9" }
diff --git a/runtime/queries/hosts/highlights.scm b/runtime/queries/hosts/highlights.scm
new file mode 100644
index 0000000000000..9d069031c9ccc
--- /dev/null
+++ b/runtime/queries/hosts/highlights.scm
@@ -0,0 +1,3 @@
+(comment) @comment
+(ip) @namespace
+(host) @string