diff --git a/README.md b/README.md
index dc7ccd198..a9dc7e739 100644
--- a/README.md
+++ b/README.md
@@ -193,6 +193,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [x] [bp](https://github.com/ambroisie/tree-sitter-bp) (maintained by @ambroisie)
 - [x] [c](https://github.com/tree-sitter/tree-sitter-c) (maintained by @amaanq)
 - [x] [c_sharp](https://github.com/tree-sitter/tree-sitter-c-sharp) (maintained by @amaanq)
+- [x] [caddy](https://github.com/opa-oz/tree-sitter-caddy) (maintained by @opa-oz)
 - [x] [cairo](https://github.com/amaanq/tree-sitter-cairo) (maintained by @amaanq)
 - [x] [capnp](https://github.com/amaanq/tree-sitter-capnp) (maintained by @amaanq)
 - [x] [chatito](https://github.com/ObserverOfTime/tree-sitter-chatito) (maintained by @ObserverOfTime)
diff --git a/lockfile.json b/lockfile.json
index 46dca3835..7e845d3e2 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -59,6 +59,9 @@
   "c_sharp": {
     "revision": "b5eb5742f6a7e9438bee22ce8026d6b927be2cd7"
   },
+  "caddy": {
+    "revision": "6f860e7c0527b293439f5f96a1adac043e3ec18e"
+  },
   "cairo": {
     "revision": "6238f609bea233040fe927858156dee5515a0745"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index b4bbf751d..aa315efcb 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -38,6 +38,12 @@ for ft, lang in pairs {
   ts.language.register(lang, ft)
 end
 
+vim.filetype.add {
+  filename = {
+    ["Caddyfile"] = "caddy",
+  },
+}
+
 ---@class InstallInfo
 ---@field url string
 ---@field branch string|nil
@@ -233,6 +239,14 @@ list.c_sharp = {
   maintainers = { "@amaanq" },
 }
 
+list.caddy = {
+  install_info = {
+    url = "https://github.com/opa-oz/tree-sitter-caddy",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  maintainers = { "@opa-oz" },
+}
+
 list.cairo = {
   install_info = {
     url = "https://github.com/amaanq/tree-sitter-cairo",