diff --git a/README.md b/README.md
index 7ad2bebc6..973905a54 100644
--- a/README.md
+++ b/README.md
@@ -293,6 +293,7 @@ We are looking for maintainers to add more parsers and to write query files for
 - [ ] [org](https://github.com/milisims/tree-sitter-org)
 - [x] [pascal](https://github.com/Isopod/tree-sitter-pascal.git) (maintained by @Isopod)
 - [x] [passwd](https://github.com/ath3/tree-sitter-passwd) (maintained by @amaanq)
+- [x] [pem](https://github.com/ObserverOfTime/tree-sitter-pem) (maintained by @ObserverOfTime)
 - [x] [perl](https://github.com/ganezdragon/tree-sitter-perl) (maintained by @lcrownover)
 - [x] [php](https://github.com/tree-sitter/tree-sitter-php) (maintained by @tk-shirasaka)
 - [x] [phpdoc](https://github.com/claytonrcarter/tree-sitter-phpdoc) (experimental, maintained by @mikehaertl)
diff --git a/lockfile.json b/lockfile.json
index 0c252a83e..f72b18452 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -356,6 +356,9 @@
   "passwd": {
     "revision": "20239395eacdc2e0923a7e5683ad3605aee7b716"
   },
+  "pem": {
+    "revision": "3662443335bc95bac0168a338b0f29f87162c244"
+  },
   "perl": {
     "revision": "60aa138f9e1db15becad53070f4d5898b0e8a98c"
   },
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index deb542a5b..ac8695f55 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -1084,6 +1084,14 @@ list.passwd = {
   maintainers = { "@amaanq" },
 }
 
+list.pem = {
+  install_info = {
+    url = "https://github.com/ObserverOfTime/tree-sitter-pem",
+    files = { "src/parser.c" },
+  },
+  maintainers = { "@ObserverOfTime" },
+}
+
 list.perl = {
   install_info = {
     url = "https://github.com/ganezdragon/tree-sitter-perl",
diff --git a/queries/pem/folds.scm b/queries/pem/folds.scm
new file mode 100644
index 000000000..f0cdabd26
--- /dev/null
+++ b/queries/pem/folds.scm
@@ -0,0 +1 @@
+(content) @fold
diff --git a/queries/pem/highlights.scm b/queries/pem/highlights.scm
new file mode 100644
index 000000000..9192e88c0
--- /dev/null
+++ b/queries/pem/highlights.scm
@@ -0,0 +1,11 @@
+["BEGIN" "END"] @keyword
+
+(dashes) @punctuation.delimiter
+
+(label) @label
+
+(data) @none
+
+(comment) @comment
+
+(ERROR) @error
diff --git a/queries/pem/injections.scm b/queries/pem/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/pem/injections.scm
@@ -0,0 +1 @@
+(comment) @comment