diff --git a/extensions/css/syntaxes/css.plist b/extensions/css/syntaxes/css.plist
index 3b1a19ea533e70dc306b3a901ffc9c6e71c0443c..75c13c5c6f067a1b0f79c0519ad568ec0bc7a8bd 100644
--- a/extensions/css/syntaxes/css.plist
+++ b/extensions/css/syntaxes/css.plist
@@ -708,7 +708,7 @@
 			<array>
 				<dict>
 					<key>match</key>
-					<string>\b(a|abbr|address|area|article|aside|audio|b|base|bdi|bdo|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|data|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|main|map|mark|menu|menuitem|meta|meter|nav|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|small|source|span|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|u|ul|var|video|wbr)\b</string>
+					<string>\b(a|abbr|address|area|article|aside|audio|b|base|bdi|bdo|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|data|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|main|map|mark|menu|menuitem|meta|meter|nav|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|small|source|span|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|u|ul|var|video|wbr)\b</string>
 					<key>name</key>
 					<string>entity.name.tag.css</string>
 				</dict>
diff --git a/src/vs/languages/css/common/services/languageFacts.ts b/src/vs/languages/css/common/services/languageFacts.ts
index 5ca63e38be4c7473cfa9dfee167035b72d90ed68..6f693f095799970b83e87fc8097c20ef73fdfd04 100644
--- a/src/vs/languages/css/common/services/languageFacts.ts
+++ b/src/vs/languages/css/common/services/languageFacts.ts
@@ -205,9 +205,9 @@ export var units : { [unitName:string]:string[] } = {
 export var html5Tags = ['a', 'abbr', 'address', 'area', 'article', 'aside', 'audio', 'b', 'base', 'bdi', 'bdo', 'blockquote', 'body', 'br', 'button', 'canvas', 'caption',
 	'cite', 'code', 'col', 'colgroup', 'data', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'figcaption', 'figure', 'footer',
 	'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'i', 'iframe', 'img', 'input', 'ins', 'kbd', 'keygen', 'label', 'legend', 'li', 'link',
-	'main', 'map', 'mark', 'menu', 'menuitem', 'meta', 'meter', 'nav', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'p', 'param', 'pre', 'progress', 'q', 'rb',
-	'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strong', 'style', 'sub', 'summary', 'sup', 'svg', 'table', 'tbody', 'td', 'template',
-	'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'u', 'ul', 'var', 'video', 'wbr' ];
+	'main', 'map', 'mark', 'menu', 'menuitem', 'meta', 'meter', 'nav', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'p', 'param', 'picture', 'pre', 'progress', 'q',
+	'rb', 'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strong', 'style', 'sub', 'summary', 'sup', 'svg', 'table', 'tbody', 'td',
+	'template', 'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'u', 'ul', 'var', 'video', 'wbr' ];
 
 export function isColorConstructor(node:nodes.Function): boolean {
 	var name = node.getName();
diff --git a/src/vs/languages/html/common/htmlTags.ts b/src/vs/languages/html/common/htmlTags.ts
index a1fbbae23899832a78799a3011c1acfaf5fdf53e..1eed73db38a391a0e7df9d7f7fe3f7fdea07ec09 100644
--- a/src/vs/languages/html/common/htmlTags.ts
+++ b/src/vs/languages/html/common/htmlTags.ts
@@ -87,6 +87,7 @@ export function getHTML5TagProvider(): IHTMLTagProvider {
 		wbr: none,
 		ins: ['cite', 'datetime'],
 		del: ['cite', 'datetime'],
+		picture: none,
 		img: ['alt', 'src', 'srcset', 'crossorigin:xo', 'usemap', 'ismap:v', 'width', 'height'],
 		iframe: ['src', 'srcdoc', 'name', 'sandbox:sb', 'seamless:v', 'allowfullscreen:v', 'width', 'height'],
 		embed: ['src', 'type', 'width', 'height'],