diff --git a/.gitmodules b/.gitmodules
index f245c920..ea5847d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -785,3 +785,6 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/xquery"]
 	path = vendor/grammars/xquery
 	url = https://github.com/textmate/xquery.tmbundle
+[submodule "vendor/grammars/language-emacs-lisp"]
+	path = vendor/grammars/language-emacs-lisp
+	url = https://github.com/Alhadis/language-emacs-lisp
diff --git a/grammars.yml b/grammars.yml
index 72c5b422..fb258563 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -354,6 +354,8 @@ vendor/grammars/language-csound:
 - source.csound
 - source.csound-document
 - source.csound-score
+vendor/grammars/language-emacs-lisp:
+- source.emacs.lisp
 vendor/grammars/language-gfm:
 - source.gfm
 vendor/grammars/language-graphql:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index f8e97318..928a4f14 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1027,7 +1027,7 @@ Elm:
 
 Emacs Lisp:
   type: programming
-  tm_scope: source.lisp
+  tm_scope: source.emacs.lisp
   color: "#c065db"
   aliases:
   - elisp
diff --git a/vendor/grammars/language-emacs-lisp b/vendor/grammars/language-emacs-lisp
new file mode 160000
index 00000000..76ec86a3
--- /dev/null
+++ b/vendor/grammars/language-emacs-lisp
@@ -0,0 +1 @@
+Subproject commit 76ec86a3eb1bc819a4f19de7295a19602a935c09
diff --git a/vendor/licenses/grammar/language-emacs-lisp.txt b/vendor/licenses/grammar/language-emacs-lisp.txt
new file mode 100644
index 00000000..46603bd3
--- /dev/null
+++ b/vendor/licenses/grammar/language-emacs-lisp.txt
@@ -0,0 +1,18 @@
+---
+type: grammar
+name: language-emacs-lisp
+license: isc
+---
+Copyright (c) 2016, John Gardner
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.