diff --git a/grammars.yml b/grammars.yml
index a825100a..9140c82f 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -337,6 +337,7 @@ vendor/grammars/language-coffee-script:
 - source.litcoffee
 vendor/grammars/language-crystal:
 - source.crystal
+- text.html.ecr
 vendor/grammars/language-csharp:
 - source.cake
 - source.cs
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 81051979..38f3445b 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1404,6 +1404,16 @@ HTML+Django:
   - html+jinja
   - htmldjango
   ace_mode: django
+  
+HTML+ECR:
+  type: markup
+  tm_scope: text.html.ecr
+  group: HTML
+  aliases:
+  - ecr
+  extensions:
+  - .ecr
+  ace_mode: text
 
 HTML+EEX:
   type: markup
diff --git a/samples/HTML+ECR/greeting.ecr b/samples/HTML+ECR/greeting.ecr
new file mode 100644
index 00000000..3f4709ce
--- /dev/null
+++ b/samples/HTML+ECR/greeting.ecr
@@ -0,0 +1,5 @@
+<% if @name %>
+  Greeting, <%= @name %>!
+<% else %>
+  Greeting!
+<% end %>
diff --git a/vendor/grammars/language-crystal b/vendor/grammars/language-crystal
index f87d6864..ec1e4991 160000
--- a/vendor/grammars/language-crystal
+++ b/vendor/grammars/language-crystal
@@ -1 +1 @@
-Subproject commit f87d68645c9a4243a7942e6b414449f1eec8a3e7
+Subproject commit ec1e4991e6647da9ca2c5337b795700c1f6ee7e4