diff --git a/extensions/html/package.json b/extensions/html/package.json
index b7d34877f26cf83af47e07d84554ac8159311981..d6ef560a5a68fe29bc7960242b56c136b22459e1 100644
--- a/extensions/html/package.json
+++ b/extensions/html/package.json
@@ -126,6 +126,13 @@
           "default": "head, body, /html",
           "description": "%html.format.extraLiners.desc%"
         },
+        "html.format.wrapAttributes": {
+          "type": "string",
+          "default": "auto",
+          "enum": [ "auto", "force" ],
+          "enumDescriptions": ["%html.format.wrapAttributes.auto%", "%html.format.wrapAttributes.force%"],
+          "description": "%html.format.wrapAttributes.desc%"
+        },
         "html.suggest.angular1": {
           "type": "boolean",
           "default": true,
diff --git a/extensions/html/package.nls.json b/extensions/html/package.nls.json
index f66e083890f2f1202c1d7ddab9f51994f73e1a5f..7c2445bf9260c2e3e72f7c2b631af767e0a9e4ad 100644
--- a/extensions/html/package.nls.json
+++ b/extensions/html/package.nls.json
@@ -8,6 +8,9 @@
 	"html.format.indentHandlebars.desc": "Format and indent {{#foo}} and {{/foo}}.",
 	"html.format.endWithNewline.desc": "End with a newline.",
 	"html.format.extraLiners.desc": "List of tags, comma separated, that should have an extra newline before them. 'null' defaults to \"head, body, /html\".",
+	"html.format.wrapAttributes.desc": "Wrap attributes always ('force') or only when line length is exceeded ('auto').",
+	"html.format.wrapAttributes.auto": "Wrap attributes when line length is exceeded.",
+	"html.format.wrapAttributes.force": "Always wrap attributes.",
 	"html.suggest.angular1.desc":  "Configures if the built-in HTML language support suggests Angular V1 tags and properties.",
 	"html.suggest.ionic.desc": "Configures if the built-in HTML language support suggests Ionic tags, properties and values.",
 	"html.suggest.html5.desc":"Configures if the built-in HTML language support suggests HTML5 tags, properties and values.",
diff --git a/extensions/html/server/npm-shrinkwrap.json b/extensions/html/server/npm-shrinkwrap.json
index be8c77591127af53b3dfc7435657c3ab8c01f986..24bfd2fad1f195adaf486459651760b69242bfdc 100644
--- a/extensions/html/server/npm-shrinkwrap.json
+++ b/extensions/html/server/npm-shrinkwrap.json
@@ -8,9 +8,9 @@
       "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.0.0-next.6.tgz"
     },
     "vscode-html-languageservice": {
-      "version": "2.0.0-next.3",
+      "version": "2.0.0-next.4",
       "from": "vscode-html-languageservice@next",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.0-next.3.tgz"
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.0.0-next.4.tgz"
     },
     "vscode-jsonrpc": {
       "version": "3.0.1-alpha.2",
diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json
index e6d4b8cf772d2705a0c7eaaa79853d1aad94c8e3..ec63147e8f8988120fb291fde12bbdce0302a723 100644
--- a/extensions/html/server/package.json
+++ b/extensions/html/server/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "vscode-css-languageservice": "^2.0.0-next.6",
-    "vscode-html-languageservice": "^2.0.0-next.3",
+    "vscode-html-languageservice": "^2.0.0-next.4",
     "vscode-languageserver": "3.0.1-alpha.2",
     "vscode-nls": "^1.0.7",
     "vscode-uri": "^1.0.0"