diff --git a/.gitmodules b/.gitmodules
index f7a30d04..e8dd1bc7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -800,3 +800,6 @@
 [submodule "vendor/grammars/EBNF.tmbundle"]
 	path = vendor/grammars/EBNF.tmbundle
 	url = https://github.com/sanssecours/EBNF.tmbundle
+[submodule "vendor/grammars/language-fontforge"]
+	path = vendor/grammars/language-fontforge
+	url = https://github.com/Alhadis/language-fontforge
diff --git a/grammars.yml b/grammars.yml
index 0d28c873..545070ce 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -362,6 +362,10 @@ vendor/grammars/language-csound:
 - source.csound-score
 vendor/grammars/language-emacs-lisp:
 - source.emacs.lisp
+vendor/grammars/language-fontforge:
+- source.fontforge
+- source.opentype
+- text.sfd
 vendor/grammars/language-gfm:
 - source.gfm
 vendor/grammars/language-graphql:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index da4aa889..ffcff6cc 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1141,9 +1141,9 @@ Emacs Lisp:
   - ".gnus"
   - ".spacemacs"
   - ".viper"
-  - "Project.ede"
-  - "_emacs"
-  - "abbrev_defs"
+  - Project.ede
+  - _emacs
+  - abbrev_defs
   extensions:
   - ".el"
   - ".emacs"
@@ -2956,6 +2956,15 @@ OpenSCAD:
   - ".scad"
   tm_scope: none
   ace_mode: scad
+  language_id: 431
+OpenType Feature File:
+  type: data
+  aliases:
+  - AFDKO
+  extensions:
+  - ".fea"
+  tm_scope: source.opentype
+  ace_mode: text
   language_id: 266
 Org:
   type: prose
@@ -3175,7 +3184,7 @@ Perl6:
 Pic:
   type: markup
   group: Groff
-  tm_scope: "source.pic"
+  tm_scope: source.pic
   extensions:
   - ".pic"
   - ".chem"
@@ -4030,6 +4039,13 @@ SourcePawn:
   - ".sma"
   tm_scope: source.sp
   ace_mode: text
+  language_id: 432
+Spline Font Database:
+  type: data
+  extensions:
+  - ".sfd"
+  tm_scope: text.sfd
+  ace_mode: yaml
   language_id: 354
 Squirrel:
   type: programming
@@ -4261,6 +4277,7 @@ Text:
   - ".no"
   filenames:
   - COPYING
+  - FONTLOG
   - INSTALL
   - LICENSE
   - NEWS
diff --git a/vendor/grammars/language-fontforge b/vendor/grammars/language-fontforge
new file mode 160000
index 00000000..b8233304
--- /dev/null
+++ b/vendor/grammars/language-fontforge
@@ -0,0 +1 @@
+Subproject commit b8233304fdc9575a08a62f9280587050b10518f6
diff --git a/vendor/licenses/grammar/language-fontforge.txt b/vendor/licenses/grammar/language-fontforge.txt
new file mode 100644
index 00000000..3c0b29a8
--- /dev/null
+++ b/vendor/licenses/grammar/language-fontforge.txt
@@ -0,0 +1,18 @@
+---
+type: grammar
+name: language-fontforge
+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.