diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 1e0df216..49bb3707 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -280,6 +280,13 @@ Eiffel:
   extensions:
   - .e
 
+Elixir:
+  type: programming
+  primary_extension: .ex
+  extensions:
+  - .ex
+  - .exs
+
 Emacs Lisp:
   type: programming
   lexer: Scheme