diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 0ad6dedb683b..368b178ffe6f 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -93,6 +93,7 @@
 | openscad | ✓ |  |  | `openscad-lsp` |
 | org | ✓ |  |  |  |
 | pascal | ✓ | ✓ |  | `pasls` |
+| passwd | ✓ |  |  |  |
 | pem | ✓ |  |  |  |
 | perl | ✓ | ✓ | ✓ |  |
 | php | ✓ | ✓ | ✓ | `intelephense` |
diff --git a/languages.toml b/languages.toml
index 9ecd1b789b03..1eb8f3c34694 100644
--- a/languages.toml
+++ b/languages.toml
@@ -2146,3 +2146,13 @@ grammar = "pem"
 [[grammar]]
 name = "pem"
 source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a4330a1aa507c7297bc322204f936ec1132c" }
+
+[[language]]
+name = "passwd"
+scope = "source.passwd"
+file-types = ["passwd"]
+roots = []
+
+[[grammar]]
+name = "passwd"
+source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395eacdc2e0923a7e5683ad3605aee7b716" }
diff --git a/runtime/queries/passwd/highlights.scm b/runtime/queries/passwd/highlights.scm
new file mode 100644
index 000000000000..00751750d346
--- /dev/null
+++ b/runtime/queries/passwd/highlights.scm
@@ -0,0 +1,7 @@
+(user) @namespace
+(auth) @keyword
+(uid) @constant
+(gid) @constant
+(gecos) @string
+(home) @variable
+(shell) @attribute