diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index e5bc56b211..1144628531 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -937,6 +937,13 @@ Textile:
   extensions:
   - .textile
 
+Twig:
+  type: markup
+  group: PHP
+  lexer: HTML+Django/Jinja
+  extensions:
+  - .twig
+
 VHDL:
   type: programming
   lexer: Text only