diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 8988365a98..2c5b2588f8 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2433,6 +2433,16 @@ JavaScript:
   - v8
   - v8-shell
   language_id: 183
+JavaScript+ERB:
+  type: programming
+  tm_scope: source.js
+  group: JavaScript
+  extensions:
+  - ".js.erb"
+  ace_mode: javascript
+  codemirror_mode: javascript
+  codemirror_mime_type: application/javascript
+  language_id: 914318960
 Jison:
   type: programming
   group: Yacc
diff --git a/samples/JavaScript+ERB/create.js.erb b/samples/JavaScript+ERB/create.js.erb
new file mode 100644
index 0000000000..6440697786
--- /dev/null
+++ b/samples/JavaScript+ERB/create.js.erb
@@ -0,0 +1 @@
+$("<%= escape_javascript(render @model) %>").appendTo("#models");
diff --git a/vendor/README.md b/vendor/README.md
index f88235cee2..dad5ab1abd 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -196,6 +196,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Java Properties:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **Java Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **JavaScript:** [atom/language-javascript](https://github.com/atom/language-javascript)
+- **JavaScript+ERB:** [atom/language-javascript](https://github.com/atom/language-javascript)
 - **Jison:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
 - **Jison Lex:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
 - **Jolie:** [fmontesi/language-jolie](https://github.com/fmontesi/language-jolie)