diff --git a/grammars.yml b/grammars.yml
index 4eee0d23..c2be7632 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -250,6 +250,7 @@ vendor/grammars/elixir-tmbundle:
 - source.elixir
 - text.elixir
 - text.html.elixir
+- text.html.eex
 vendor/grammars/erlang.tmbundle:
 - source.erlang
 - text.html.erlang.yaws
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index d085a963..107dc3d1 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1333,6 +1333,16 @@ HTML+Django:
   - htmldjango
   ace_mode: django
 
+HTML+EEX:
+  type: markup
+  tm_scope: text.html.eex
+  group: HTML
+  aliases:
+  - eex
+  extensions:
+  - .eex
+  ace_mode: html_eex
+
 HTML+ERB:
   type: markup
   tm_scope: text.html.erb
diff --git a/samples/HTML+EEX/index.html.erb b/samples/HTML+EEX/index.html.erb
new file mode 100644
index 00000000..5960a441
--- /dev/null
+++ b/samples/HTML+EEX/index.html.erb
@@ -0,0 +1,26 @@
+<h1>Listing Books</h1>
+ 
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Summary</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<%= for book <- @books do %>
+  <tr>
+    <%# comment %>
+    <td><%= book.title %></td>
+    <td><%= book.content %></td>
+    <td><%= link "Show", to: book_path(@conn, :show, book) %></td>
+    <td><%= link "Edit", to: book_path(@conn, :edit, book) %></td>
+    <td><%= link "Delete", to: book_path(@conn, :delete, book), method: :delete, data: [confirm: "Are you sure?"] %></td>
+  </tr>
+<% end %>
+</table>
+ 
+<br />
+ 
+<%= link "New book", to: book_path(@conn, :new) %>