diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 4e8e1c82d..efafc3e58 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -9,8 +9,10 @@
 | css | ✓ |  |  | `vscode-css-language-server` |
 | dart | ✓ |  | ✓ | `dart` |
 | dockerfile | ✓ |  |  | `docker-langserver` |
+| ejs | ✓ |  |  |  |
 | elixir | ✓ |  |  | `elixir-ls` |
 | elm | ✓ |  |  | `elm-language-server` |
+| erb | ✓ |  |  |  |
 | erlang | ✓ |  |  | `erlang_ls` |
 | fish | ✓ | ✓ | ✓ |  |
 | git-commit | ✓ |  |  |  |
diff --git a/languages.toml b/languages.toml
index e80ca280b..13c34e010 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1088,3 +1088,25 @@ language-server = { command = "sourcekit-lsp" }
 [[grammar]]
 name = "swift"
 source = { git = "https://github.com/Dispersia/tree-sitter-swift", rev = "e75240f89bb3bfd3396155859ae364e5c58d7377" }
+
+[[language]]
+name = "erb"
+scope = "text.html.erb"
+injection-regex = "erb"
+file-types = ["erb"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+grammar = "embedded-template"
+
+[[language]]
+name = "ejs"
+scope = "text.html.ejs"
+injection-regex = "ejs"
+file-types = ["ejs"]
+roots = []
+indent = { tab-width = 2, unit = "  " }
+grammar = "embedded-template"
+
+[[grammar]]
+name = "embedded-template"
+source = { git = "https://github.com/tree-sitter/tree-sitter-embedded-template", rev = "d21df11b0ecc6fd211dbe11278e92ef67bd17e97" }
diff --git a/runtime/queries/ejs/highlights.scm b/runtime/queries/ejs/highlights.scm
new file mode 100644
index 000000000..0bf76a7d4
--- /dev/null
+++ b/runtime/queries/ejs/highlights.scm
@@ -0,0 +1,12 @@
+(comment_directive) @comment
+
+[
+  "<%#"
+  "<%"
+  "<%="
+  "<%_"
+  "<%-"
+  "%>"
+  "-%>"
+  "_%>"
+] @keyword
diff --git a/runtime/queries/ejs/injections.scm b/runtime/queries/ejs/injections.scm
new file mode 100644
index 000000000..e612a936c
--- /dev/null
+++ b/runtime/queries/ejs/injections.scm
@@ -0,0 +1,7 @@
+((content) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined))
+
+((code) @injection.content
+ (#set! injection.language "javascript")
+ (#set! injection.combined))
diff --git a/runtime/queries/erb/highlights.scm b/runtime/queries/erb/highlights.scm
new file mode 100644
index 000000000..38830615f
--- /dev/null
+++ b/runtime/queries/erb/highlights.scm
@@ -0,0 +1 @@
+; inherits: ejs
diff --git a/runtime/queries/erb/injections.scm b/runtime/queries/erb/injections.scm
new file mode 100644
index 000000000..2824f7a00
--- /dev/null
+++ b/runtime/queries/erb/injections.scm
@@ -0,0 +1,7 @@
+((content) @injection.content
+ (#set! injection.language "html")
+ (#set! injection.combined))
+
+((code) @injection.content
+ (#set! injection.language "ruby")
+ (#set! injection.combined))