diff --git a/.gitmodules b/.gitmodules
index e3dfa2a7..f4d07d4a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -707,3 +707,6 @@
 [submodule "vendor/grammars/atom-language-stan"]
 	path = vendor/grammars/atom-language-stan
 	url = https://github.com/jrnold/atom-language-stan
+[submodule "vendor/grammars/language-yang"]
+	path = vendor/grammars/language-yang
+	url = https://github.com/DzonyKalafut/language-yang.git
diff --git a/grammars.yml b/grammars.yml
index c8de7b72..8edfce74 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -372,6 +372,8 @@ vendor/grammars/language-xbase:
 - source.harbour
 vendor/grammars/language-yaml:
 - source.yaml
+vendor/grammars/language-yang/:
+- source.yang
 vendor/grammars/latex.tmbundle:
 - text.bibtex
 - text.log.latex
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 9903f2c9..a6813602 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3905,7 +3905,7 @@ YANG:
   type: data
   extensions:
   - .yang
-  tm_scope: none
+  tm_scope: source.yang
   ace_mode: text
 
 Yacc:
diff --git a/vendor/grammars/language-yang b/vendor/grammars/language-yang
new file mode 160000
index 00000000..c2d4a701
--- /dev/null
+++ b/vendor/grammars/language-yang
@@ -0,0 +1 @@
+Subproject commit c2d4a701d15e0ea7a1cef4f2fe4396b336504d7c