diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
index a4c0d4de9..08443a32f 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.html
@@ -1,12 +1,16 @@
 
 <script type="text/html" data-template-name="yaml">
     <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-sign-in"></i> <span data-i18n="common.label.propertyIn"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+        <label for="node-input-propertyOut"><i class="fa fa-sign-out"></i> <span data-i18n="common.label.propertyOut"></span></label>
+        <input type="text" id="node-input-propertyOut" style="width:70%;"/>
     </div>
 </script>
 
@@ -17,7 +21,10 @@
         defaults: {
             property: {value:"payload",required:true,
                        validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true }),
-                       label:RED._("node-red:common.label.property")},
+                       label:RED._("node-red:common.label.propertyIn")},
+            propertyOut: {value:"payload",required:true,
+                       validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true}),
+                       label:RED._("node-red:common.label.propertyOut")},
             name: {value:""}
         },
         inputs:1,
@@ -34,6 +41,10 @@
                 $("#node-input-property").val("payload");
             }
             $("#node-input-property").typedInput({default:'msg',types:['msg']});
+            if (this.propertyOut === undefined) {
+                $("#node-input-propertyOut").val("payload");
+            }
+            $("#node-input-propertyOut").typedInput({default:'msg',types:['msg']});
         }
     });
 </script>
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.js b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.js
index 69a6bf444..bd5ab09e4 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-YAML.js
@@ -5,6 +5,7 @@ module.exports = function(RED) {
     function YAMLNode(n) {
         RED.nodes.createNode(this,n);
         this.property = n.property||"payload";
+        this.propertyOut = n.propertyOut||this.property;
         var node = this;
         this.on("input", function(msg,send,done) {
             var value = RED.util.getMessageProperty(msg,node.property);
@@ -12,7 +13,7 @@ module.exports = function(RED) {
                 if (typeof value === "string") {
                     try {
                         value = yaml.load(value);
-                        RED.util.setMessageProperty(msg,node.property,value);
+                        RED.util.setMessageProperty(msg,node.propertyOut,value);
                         send(msg);
                         done();
                     }
@@ -22,7 +23,7 @@ module.exports = function(RED) {
                     if (!Buffer.isBuffer(value)) {
                         try {
                             value = yaml.dump(value);
-                            RED.util.setMessageProperty(msg,node.property,value);
+                            RED.util.setMessageProperty(msg,node.propertyOut,value);
                             send(msg);
                             done();
                         }