diff --git a/Markdown/Code Block Syntaxes.sublime-completions b/Markdown/Code Block Syntaxes.sublime-completions
index 8eaabb23c3..143ac61b41 100644
--- a/Markdown/Code Block Syntaxes.sublime-completions	
+++ b/Markdown/Code Block Syntaxes.sublime-completions	
@@ -577,5 +577,11 @@
 			"kind": ["markup", "s", "Syntax"],
 			"details": "Specifies <code>YAML</code> code highlighting"
 		},
+		{
+			"trigger": "yml",
+			"annotation": "YAML",
+			"kind": ["markup", "s", "Syntax"],
+			"details": "Specifies <code>YAML</code> code highlighting"
+		},
 	],
 }
\ No newline at end of file
diff --git a/Markdown/Markdown.sublime-syntax b/Markdown/Markdown.sublime-syntax
index 8c8182a18b..48b5006ae2 100644
--- a/Markdown/Markdown.sublime-syntax
+++ b/Markdown/Markdown.sublime-syntax
@@ -293,7 +293,7 @@ contexts:
       escape_captures:
         0: meta.frontmatter.markdown
         1: punctuation.section.block.end.frontmatter.markdown
-    - match: (---)\s*(?i:(yaml)\s*)?\n
+    - match: (---)\s*(?i:(yaml|yml)\s*)?\n
       captures:
         0: meta.frontmatter.markdown
         1: punctuation.section.block.begin.frontmatter.markdown
@@ -1692,7 +1692,7 @@ contexts:
     - match: |-
          (?x)
           {{fenced_code_block_start}}
-          ((?i:yaml))
+          ((?i:yaml|yml))
           {{fenced_code_block_trailing_infostring_characters}}
       captures:
         0: meta.code-fence.definition.begin.yaml.markdown-gfm