diff --git a/.gitmodules b/.gitmodules
index 42d2b1ba..a43b324c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -651,3 +651,6 @@
 [submodule "vendor/grammars/Sublime-Red"]
 	path = vendor/grammars/Sublime-Red
 	url = https://github.com/Oldes/Sublime-Red
+[submodule "vendor/grammars/jflex.tmbundle"]
+	path = vendor/grammars/jflex.tmbundle
+	url = https://github.com/jflex-de/jflex.tmbundle.git
diff --git a/grammars.yml b/grammars.yml
index e8c2d019..e67b0710 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -295,6 +295,8 @@ vendor/grammars/javadoc.tmbundle:
 - text.html.javadoc
 vendor/grammars/javascript-objective-j.tmbundle:
 - source.js.objj
+vendor/grammars/jflex.tmbundle:
+- source.jflex
 vendor/grammars/jquery-tmbundle:
 - source.js.jquery
 vendor/grammars/json.tmbundle:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 46ee1333..a694d484 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1440,6 +1440,7 @@ JFlex:
   extensions:
   - .flex
   - .jflex
+  tm_scope: source.jflex
   ace_mode: text
 
 JSON:
diff --git a/vendor/grammars/jflex.tmbundle b/vendor/grammars/jflex.tmbundle
new file mode 160000
index 00000000..12a7a88b
--- /dev/null
+++ b/vendor/grammars/jflex.tmbundle
@@ -0,0 +1 @@
+Subproject commit 12a7a88b7a34bb9490b6077ad743332acf66a456