diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index d66f7bef1..ac9ee78da 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -46,6 +46,7 @@
 | dot | ✓ |  |  | `dot-language-server` |
 | dtd | ✓ |  |  |  |
 | dune | ✓ |  |  |  |
+| dunstrc | ✓ |  |  |  |
 | earthfile | ✓ | ✓ | ✓ | `earthlyls` |
 | edoc | ✓ |  |  |  |
 | eex | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index 680d0dcd8..6f6ef8484 100644
--- a/languages.toml
+++ b/languages.toml
@@ -4313,3 +4313,14 @@ comment-tokens = "#"
 [[grammar]]
 name = "debian"
 source = { git = "https://gitlab.com/MggMuggins/tree-sitter-debian", rev = "9b3f4b78c45aab8a2f25a5f9e7bbc00995bc3dde" }
+
+[[language]]
+name = "dunstrc"
+scope = "source.dunstrc"
+comment-tokens = ["#", ";"]
+file-types = [ { glob = "dunst/dunstrc" } ]
+grammar = "dunstrc"
+
+[[grammar]]
+name = "dunstrc"
+source = { git = "https://github.com/rotmh/tree-sitter-dunstrc", rev = "b2d193553603c41762418d67827883492c9119a3" }
diff --git a/runtime/queries/dunstrc/highlights.scm b/runtime/queries/dunstrc/highlights.scm
new file mode 100644
index 000000000..8964b43de
--- /dev/null
+++ b/runtime/queries/dunstrc/highlights.scm
@@ -0,0 +1,14 @@
+(assign
+  (key) @attribute)
+
+(comment) @comment.line
+
+[
+  "["
+  "]"
+] @punctuation.bracket
+
+"=" @operator
+
+(section
+  (name) @namespace)