diff --git a/.gitmodules b/.gitmodules
index f94b5fe1..d65fee60 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -665,3 +665,6 @@
 [submodule "vendor/grammars/SublimePuppet"]
 	path = vendor/grammars/SublimePuppet
 	url = https://github.com/russCloak/SublimePuppet
+[submodule "vendor/grammars/sublimeassembly"]
+	path = vendor/grammars/sublimeassembly
+	url = https://github.com/Nessphoro/sublimeassembly
diff --git a/grammars.yml b/grammars.yml
index c0695262..46f6247b 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -531,6 +531,8 @@ vendor/grammars/sublime_cobol:
 vendor/grammars/sublime_man_page_support:
 - source.man
 - text.groff
+vendor/grammars/sublimeassembly/:
+- source.assembly
 vendor/grammars/sublimeprolog/:
 - source.prolog
 - source.prolog.eclipse
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index b3993531..cc1832cc 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -230,7 +230,7 @@ Assembly:
   - .a51
   - .inc
   - .nasm
-  tm_scope: none
+  tm_scope: source.assembly
   ace_mode: assembly_x86
 
 Augeas:
diff --git a/vendor/grammars/sublimeassembly b/vendor/grammars/sublimeassembly
new file mode 160000
index 00000000..cb9c99a4
--- /dev/null
+++ b/vendor/grammars/sublimeassembly
@@ -0,0 +1 @@
+Subproject commit cb9c99a4a915e77da0680e4ee5542f768f7697fa