diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index b768d3c1d90..9a8c21d3892 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -130,6 +130,31 @@
                             "type": "string",
                             "default": " ",
                             "description": "%emmetPreferencesStylusBetween%"
+                        },
+                        "bem.elementSeparator": {
+                            "type": "string",
+                            "default": "__",
+                            "description": "%emmetPreferencesBemElementSeparator%"
+                        },
+                        "bem.modifierSeparator": {
+                            "type": "string",
+                            "default": "_",
+                            "description": "%emmetPreferencesBemModifierSeparator%"
+                        },
+                        "filter.commentBefore": {
+                            "type": "string",
+                            "default": "",
+                            "description": "%emmetPreferencesFilterCommentBefore%"
+                        },
+                        "filter.commentAfter": {
+                            "type": "string",
+                            "default": "\n<!-- /[#ID][.CLASS] -->",
+                            "description": "%emmetPreferencesFilterCommentAfter%"
+                        },
+                        "filter.commentTrigger": {
+                            "type": "array",
+                            "default": ["id", "class"],
+                            "description": "%emmetPreferencesFilterCommentTrigger%"
                         }
                     }
                 },
diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json
index 4d63301d0ac..837b936b5b1 100644
--- a/extensions/emmet/package.nls.json
+++ b/extensions/emmet/package.nls.json
@@ -39,5 +39,10 @@
 	"emmetPreferencesCssBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations",
 	"emmetPreferencesSassBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Sass files",
 	"emmetPreferencesStylusBetween": "Symbol to be placed at the between CSS property and value when expanding CSS abbreviations in Stylus files",
-	"emmetShowSuggestionsAsSnippets": "If true, then emmet suggestions will show up as snippets allowing you to order them as per editor.snippetSuggestions setting."
+	"emmetShowSuggestionsAsSnippets": "If true, then emmet suggestions will show up as snippets allowing you to order them as per editor.snippetSuggestions setting.",
+	"emmetPreferencesBemElementSeparator": "Element separator used for classes when using the bem filter",
+	"emmetPreferencesBemModifierSeparator": "Modifer separator used for classes when using the bem filter",
+	"emmetPreferencesFilterCommentBefore": "A definition of comment that should be placed before after element when comment filter is applied.",
+	"emmetPreferencesFilterCommentAfter": "A definition of comment that should be placed before matched element when comment filter is applied.",
+	"emmetPreferencesFilterCommentTrigger": "A comma-separated list of attribute names that should exist in abbreviation for the comment filter to be applied"
 }
\ No newline at end of file