diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 0de559ee..945479fb 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1036,6 +1036,18 @@ Frege:
   - .fr
   tm_scope: source.haskell
   ace_mode: haskell
+  
+FreeMarker:
+  type: programming
+  color: "#0050b2"
+  group: Java
+  search_term: ftl
+  aliases:
+  - ftl
+  extensions:
+  - .ftl
+  tm_scope: text.html.ftl
+  ace_mode: ftl
 
 G-code:
   type: data