diff --git a/.gitmodules b/.gitmodules
index 3de13b8452..b5de73ab20 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,9 +91,6 @@
 [submodule "vendor/grammars/bro-sublime"]
 	path = vendor/grammars/bro-sublime
 	url = https://github.com/bro/bro-sublime
-[submodule "vendor/grammars/sublime_man_page_support"]
-	path = vendor/grammars/sublime_man_page_support
-	url = https://github.com/carsonoid/sublime_man_page_support
 [submodule "vendor/grammars/sublime-MuPAD"]
 	path = vendor/grammars/sublime-MuPAD
 	url = https://github.com/ccreutzig/sublime-MuPAD
@@ -755,3 +752,6 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/SublimeGDB"]
 	path = vendor/grammars/SublimeGDB
 	url = https://github.com/quarnster/SublimeGDB
+[submodule "vendor/grammars/language-roff"]
+	path = vendor/grammars/language-roff
+	url = https://github.com/Alhadis/language-roff
diff --git a/grammars.yml b/grammars.yml
index 4c720b39df..0751772f4c 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -390,6 +390,9 @@ vendor/grammars/language-renpy:
 - source.renpy
 vendor/grammars/language-restructuredtext:
 - text.restructuredtext
+vendor/grammars/language-roff:
+- text.roff
+- text.runoff
 vendor/grammars/language-shellscript:
 - source.shell
 - text.shell-session
@@ -593,9 +596,6 @@ vendor/grammars/sublime_cobol:
 - source.cobol
 - source.jcl
 - source.opencobol
-vendor/grammars/sublime_man_page_support:
-- source.man
-- text.groff
 vendor/grammars/sublimeassembly/:
 - source.assembly
 vendor/grammars/sublimeprolog/:
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 56df19f3f2..67bf53a5ac 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1411,7 +1411,7 @@ Groff:
   - .n
   - .rno
   - .roff
-  tm_scope: text.groff
+  tm_scope: text.roff
   aliases:
   - nroff
   ace_mode: text
diff --git a/vendor/grammars/language-roff b/vendor/grammars/language-roff
new file mode 160000
index 0000000000..8c0b327560
--- /dev/null
+++ b/vendor/grammars/language-roff
@@ -0,0 +1 @@
+Subproject commit 8c0b327560f9e2225a6be9817ab20f84ad4f37b3
diff --git a/vendor/licenses/grammar/language-roff.txt b/vendor/licenses/grammar/language-roff.txt
new file mode 100644
index 0000000000..0bb79d8075
--- /dev/null
+++ b/vendor/licenses/grammar/language-roff.txt
@@ -0,0 +1,18 @@
+---
+type: grammar
+name: language-roff
+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.