diff --git a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
index dae51ded7..45e053f46 100644
--- a/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/io/21-httprequest.js
@@ -203,28 +203,32 @@ module.exports = function(RED) {
             var payload = null;
 
             if (method !== 'GET' && method !== 'HEAD' && typeof msg.payload !== "undefined") {
-                if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
-                    payload = msg.payload;
-                } else if (typeof msg.payload == "number") {
-                    payload = msg.payload+"";
+                if (opts.headers['content-type'] == 'multipart/form-data' && typeof payload === "object") {
+                    opts.formData = msg.payload;
                 } else {
-                    if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') {
-                        payload = querystring.stringify(msg.payload);
+                    if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
+                        payload = msg.payload;
+                    } else if (typeof msg.payload == "number") {
+                        payload = msg.payload+"";
                     } else {
-                        payload = JSON.stringify(msg.payload);
-                        if (opts.headers['content-type'] == null) {
-                            opts.headers[ctSet] = "application/json";
+                        if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') {
+                            payload = querystring.stringify(msg.payload);
+                        } else {
+                            payload = JSON.stringify(msg.payload);
+                            if (opts.headers['content-type'] == null) {
+                                opts.headers[ctSet] = "application/json";
+                            }
                         }
                     }
-                }
-                if (opts.headers['content-length'] == null) {
-                    if (Buffer.isBuffer(payload)) {
-                        opts.headers[clSet] = payload.length;
-                    } else {
-                        opts.headers[clSet] = Buffer.byteLength(payload);
+                    if (opts.headers['content-length'] == null) {
+                        if (Buffer.isBuffer(payload)) {
+                            opts.headers[clSet] = payload.length;
+                        } else {
+                            opts.headers[clSet] = Buffer.byteLength(payload);
+                        }
                     }
+                    opts.body = payload;
                 }
-                opts.body = payload;
             }
 
             if (method == 'GET' && typeof msg.payload !== "undefined" && paytoqs) {
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/io/21-httprequest.html b/packages/node_modules/@node-red/nodes/locales/en-US/io/21-httprequest.html
index aa027da2e..bbe66e07b 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/io/21-httprequest.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/io/21-httprequest.html
@@ -78,5 +78,18 @@
     <p>If <code>msg.payload</code> is an Object, the node will automatically set the content type
     of the request to <code>application/json</code> and encode the body as such.</p>
     <p>To encode the request as form data, <code>msg.headers["content-type"]</code> should be set to <code>application/x-www-form-urlencoded</code>.</p>
+    <h4>File Upload</h4>
+    <p>To perform a file upload, <code>msg.headers["content-type"]</code> should be set to <code>multipart/form-data</code>
+        and the <code>msg.payload</code> passed to the node must be an object with the following structure:</p>
+    <pre>{
+    "KEY": {
+        "value": FILE_CONTENTS,
+        "options": {
+            "filename": "FILENAME"
+        }
+    }
+}</code></pre>
+    <p>The values of <code>KEY</code>, <code>FILE_CONTENTS</code> and <code>FILENAME</code>
+    should be set to the appropriate values.</p>
 
 </script>