diff --git a/lockfile.json b/lockfile.json
index 7e845d3e2..a230a95e5 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -60,7 +60,7 @@
     "revision": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7"
   },
   "caddy": {
-    "revision": "6f860e7c0527b293439f5f96a1adac043e3ec18e"
+    "revision": "2686186edb61be47960431c93a204fb249681360"
   },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
diff --git a/queries/caddy/folds.scm b/queries/caddy/folds.scm
new file mode 100644
index 000000000..0b062847d
--- /dev/null
+++ b/queries/caddy/folds.scm
@@ -0,0 +1,2 @@
+(block) @fold
+
diff --git a/queries/caddy/highlights.scm b/queries/caddy/highlights.scm
new file mode 100644
index 000000000..94eb773c0
--- /dev/null
+++ b/queries/caddy/highlights.scm
@@ -0,0 +1,52 @@
+(comment) @comment @spell
+
+[ 
+  (env)
+  (argv)
+  (block_variable)
+  (placeholder)
+] @constant
+
+(value) @variable
+(directive (keyword) @attribute)
+(global_options (option (keyword) @attribute))
+
+(keyword) @keyword
+
+(boolean) @boolean
+
+(placeholder
+  [
+    "{"
+    "}"
+  ] @punctuation.special)
+
+
+[
+  (auto)
+] @variable.builtin
+
+[
+  (string_literal)
+  (quoted_string_literal)
+  (address)
+] @string
+
+[ 
+  (matcher) 
+  (route)
+  (snippet_name)
+] @string.special
+
+[
+  (numeric_literal)
+  (time)
+  (size)
+  (ip_literal)
+] @number
+
+[
+  "{"
+  "}"
+] @punctuation.bracket
+
diff --git a/queries/caddy/indents.scm b/queries/caddy/indents.scm
new file mode 100644
index 000000000..84bc3997b
--- /dev/null
+++ b/queries/caddy/indents.scm
@@ -0,0 +1,11 @@
+[
+  (block)
+] @indent.begin
+
+(block
+  "}" @indent.branch)
+
+(comment) @indent.auto
+
+(ERROR) @indent.auto
+
diff --git a/queries/caddy/injections.scm b/queries/caddy/injections.scm
new file mode 100644
index 000000000..5889ab7f7
--- /dev/null
+++ b/queries/caddy/injections.scm
@@ -0,0 +1,3 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
+