diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 085d92a8ffc7d..978f42a710a24 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -98,6 +98,7 @@
 | tsx | ✓ |  |  | `typescript-language-server` |
 | twig | ✓ |  |  |  |
 | typescript | ✓ |  | ✓ | `typescript-language-server` |
+| ungrammar | ✓ |  |  |  |
 | v | ✓ |  |  | `vls` |
 | vala | ✓ |  |  | `vala-language-server` |
 | verilog | ✓ | ✓ |  | `svlangserver` |
diff --git a/languages.toml b/languages.toml
index 3be20ab358553..20493e4c15057 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1527,4 +1527,17 @@ language-server = { command = "fortls", args = ["--lowercase_intrinsics"] }
 
 [[grammar]]
 name = "fortran"
-source = { git = "https://github.com/stadelmanma/tree-sitter-fortran", rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13" }
\ No newline at end of file
+source = { git = "https://github.com/stadelmanma/tree-sitter-fortran", rev = "f0f2f100952a353e64e26b0fa710b4c296d7af13" }
+
+[[language]]
+name = "ungrammar"
+scope = "source.ungrammar"
+injection-regex = "ungrammar"
+file-types = ["ungram", "ungrammar"]
+roots = []
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+
+[[grammar]]
+name = "ungrammar"
+source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "0113de880a58ea14f2a75802e9b99fcc25003d9c" }
diff --git a/runtime/queries/ungrammar/highlights.scm b/runtime/queries/ungrammar/highlights.scm
new file mode 100644
index 0000000000000..cffbdbfdb930f
--- /dev/null
+++ b/runtime/queries/ungrammar/highlights.scm
@@ -0,0 +1,17 @@
+(ERROR) @error
+
+(line_comment) @comment
+
+(identifier) @variable
+
+(token) @string
+
+[
+  "="
+  "|"
+  ":"
+  "("
+  ")"
+  "?"
+  "*"
+] @operator