diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 3a9eabb11..d66f7bef1 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -183,6 +183,7 @@
 | purescript | ✓ | ✓ |  | `purescript-language-server` |
 | python | ✓ | ✓ | ✓ | `ruff`, `jedi-language-server`, `pylsp` |
 | qml | ✓ |  | ✓ | `qmlls` |
+| quarto | ✓ |  | ✓ |  |
 | quint | ✓ |  |  | `quint-language-server` |
 | r | ✓ |  |  | `R` |
 | racket | ✓ |  | ✓ | `racket` |
diff --git a/languages.toml b/languages.toml
index 4482ca045..db997ac70 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2062,6 +2062,16 @@ auto-format = true
 name = "gleam"
 source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "426e67087fd62be5f4533581b5916b2cf010fb5b" }
 
+[[language]]
+name = "quarto"
+scope = "source.qmd"
+language-id = "qmd"
+injection-regex = "qmd"
+file-types = ["qmd"]
+indent = { tab-width = 2, unit = "  " }
+grammar = "markdown"
+block-comment-tokens = { start = "<!--", end = "-->" }
+
 [[language]]
 name = "ron"
 scope = "source.ron"
diff --git a/runtime/queries/quarto/highlights.scm b/runtime/queries/quarto/highlights.scm
new file mode 100644
index 000000000..a3a30e342
--- /dev/null
+++ b/runtime/queries/quarto/highlights.scm
@@ -0,0 +1 @@
+; inherits: markdown
diff --git a/runtime/queries/quarto/indents.scm b/runtime/queries/quarto/indents.scm
new file mode 100644
index 000000000..a3a30e342
--- /dev/null
+++ b/runtime/queries/quarto/indents.scm
@@ -0,0 +1 @@
+; inherits: markdown
diff --git a/runtime/queries/quarto/injections.scm b/runtime/queries/quarto/injections.scm
new file mode 100644
index 000000000..a3a30e342
--- /dev/null
+++ b/runtime/queries/quarto/injections.scm
@@ -0,0 +1 @@
+; inherits: markdown