diff --git a/messages/next.md b/messages/next.md
new file mode 100644
index 00000000..c206e214
--- /dev/null
+++ b/messages/next.md
@@ -0,0 +1,13 @@
+# MarkdownEditing {version} Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+## New Features
+* Add BBCode support for fenced code block
+
+## Changes
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues
diff --git a/syntaxes/Markdown.sublime-syntax b/syntaxes/Markdown.sublime-syntax
index bb938fe8..abf05aa0 100644
--- a/syntaxes/Markdown.sublime-syntax
+++ b/syntaxes/Markdown.sublime-syntax
@@ -1381,6 +1381,7 @@ contexts:
     - include: fenced-ada
     - include: fenced-ahk
     - include: fenced-arduino
+    - include: fenced-bbcode
     - include: fenced-coffee
     - include: fenced-dart
     - include: fenced-docker
@@ -2536,6 +2537,29 @@ contexts:
         1: punctuation.definition.raw.code-fence.end.markdown
         2: meta.fold.code-fence.end.markdown
 
+  fenced-bbcode:
+    - match: |-
+         (?x)
+          {{fenced_code_block_start}}
+          (?i:\s*(bbcode|bbc))
+          {{fenced_code_block_trailing_infostring_characters}}
+      captures:
+        0: meta.code-fence.definition.begin.markdown-gfm
+        2: punctuation.definition.raw.code-fence.begin.markdown
+        5: constant.other.language-name.markdown
+        6: comment.line.infostring.markdown
+        7: meta.fold.code-fence.begin.markdown
+      embed: scope:text.bbcode
+      embed_scope:
+        meta.code-fence.body.markdown-gfm
+        markup.raw.code-fence.bbcode.markdown-gfm
+        text.bbcode
+      escape: '{{fenced_code_block_escape}}'
+      escape_captures:
+        0: meta.code-fence.definition.end.markdown-gfm
+        1: punctuation.definition.raw.code-fence.end.markdown
+        2: meta.fold.code-fence.end.markdown
+
   fenced-coffee:
     - match: |-
          (?x)