diff --git a/.gitmodules b/.gitmodules
index 04e9e4b8..f8a54798 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -671,3 +671,6 @@
 [submodule "vendor/grammars/monkey"]
 	path = vendor/grammars/monkey
 	url = https://github.com/gingerbeardman/monkey.tmbundle
+[submodule "vendor/grammars/assembly"]
+	path = vendor/grammars/assembly
+	url = https://github.com/nanoant/assembly.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 31026448..d0e0b78d 100755
--- a/grammars.yml
+++ b/grammars.yml
@@ -168,6 +168,9 @@ vendor/grammars/asciidoc.tmbundle/:
 vendor/grammars/asp.tmbundle:
 - source.asp
 - text.html.asp
+vendor/grammars/assembly/:
+- objdump.x86asm
+- source.x86asm
 vendor/grammars/atom-fsharp/:
 - source.fsharp
 - source.fsharp.fsi
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 8098649d..4bd742bf 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -429,7 +429,7 @@ C-ObjDump:
   type: data
   extensions:
   - .c-objdump
-  tm_scope: none
+  tm_scope: objdump.x86asm
   ace_mode: assembly_x86
 
 C2hs Haskell:
@@ -681,7 +681,7 @@ Cpp-ObjDump:
   - .c++objdump
   - .cpp-objdump
   - .cxx-objdump
-  tm_scope: none
+  tm_scope: objdump.x86asm
   aliases:
   - c++-objdumb
   ace_mode: assembly_x86
@@ -753,7 +753,7 @@ D-ObjDump:
   type: data
   extensions:
   - .d-objdump
-  tm_scope: none
+  tm_scope: objdump.x86asm
   ace_mode: assembly_x86
 
 DIGITAL Command Language:
@@ -2422,7 +2422,7 @@ ObjDump:
   type: data
   extensions:
   - .objdump
-  tm_scope: none
+  tm_scope: objdump.x86asm
   ace_mode: assembly_x86
 
 Objective-C:
diff --git a/vendor/grammars/assembly b/vendor/grammars/assembly
new file mode 160000
index 00000000..0ef23e86
--- /dev/null
+++ b/vendor/grammars/assembly
@@ -0,0 +1 @@
+Subproject commit 0ef23e8619103e87a0a90df1b96c2567fbedf7f5
diff --git a/vendor/licenses/grammar/assembly.txt b/vendor/licenses/grammar/assembly.txt
new file mode 100644
index 00000000..c351ce72
--- /dev/null
+++ b/vendor/licenses/grammar/assembly.txt
@@ -0,0 +1,25 @@
+---
+type: grammar
+name: assembly
+license: mit
+---
+Copyright (c) 2012-2014 Adam Strzelecki
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/licenses/grammar/monkey.txt b/vendor/licenses/grammar/monkey.txt
new file mode 100644
index 00000000..76c1fed4
--- /dev/null
+++ b/vendor/licenses/grammar/monkey.txt
@@ -0,0 +1,7 @@
+---
+type: grammar
+name: monkey
+license: mit
+curated: true
+---
+monkey.tmbundle is made available under the [MIT License](http://choosealicense.com/licenses/mit/).