diff --git a/nodes/core/io/32-udp.html b/nodes/core/io/32-udp.html
index 1c2eed575..33bbb520b 100644
--- a/nodes/core/io/32-udp.html
+++ b/nodes/core/io/32-udp.html
@@ -17,9 +17,8 @@
 <!--  The Input Node  -->
 <script type="text/x-red" data-template-name="udp in">
     <div class="form-row">
-        <label for="node-input-port"><i class="fa fa-sign-in"></i> Listen</label>
-        on port <input type="text" id="node-input-port" placeholder="Port" style="width: 45px">
-        for <select id="node-input-multicast" style='width:40%'>
+        <label for="node-input-port"><i class="fa fa-sign-in"></i> Listen for</label>
+        <select id="node-input-multicast" style='width:62%'>
           <option value="false">udp messages</option>
           <option value="true">multicast messages</option>
         </select>
@@ -32,6 +31,14 @@
         <label for="node-input-iface"><i class="fa fa-random"></i> Interface</label>
         <input type="text" id="node-input-iface" placeholder="(optional) ip address of eth0">
     </div>
+    <div class="form-row">
+        <label for="node-input-port"><i class="fa fa-sign-in"></i> on Port</label>
+        <input type="text" id="node-input-port" placeholder="Port" style="width: 80px">
+        &nbsp;&nbsp;using <select id="node-input-ipv" style="width:80px">
+          <option value="udp4">ipv4</option>
+          <option value="udp6">ipv6</option>
+        </select>
+    </div>
     <div class="form-row">
         <label for="node-input-datatype"><i class="fa fa-sign-out"></i> Output</label>
         <select id="node-input-datatype" style="width: 70%;">
@@ -74,9 +81,10 @@
             name: {value:""},
             iface: {value:""},
             port: {value:"",required:true,validate:RED.validators.number()},
-            datatype: {value:"buffer",required:true},
+            ipv: {value:"udp4"},
             multicast: {value:"false"},
-            group: {value:"",validate:function(v) { return (this.multicast !== "true")||v.length > 0;} }
+            group: {value:"",validate:function(v) { return (this.multicast !== "true")||v.length > 0;} },
+            datatype: {value:"buffer",required:true}
         },
         inputs:0,
         outputs:1,
@@ -98,7 +106,7 @@
 <script type="text/x-red" data-template-name="udp out">
     <div class="form-row">
         <label for="node-input-port"><i class="fa fa-envelope"></i> Send a</label>
-        <select id="node-input-multicast" style='width:40%'>
+        <select id="node-input-multicast" style="width:40%">
           <option value="false">udp message</option>
           <option value="broad">broadcast message</option>
           <option value="multi">multicast message</option>
@@ -107,7 +115,11 @@
     </div>
     <div class="form-row node-input-addr">
         <label for="node-input-addr" id="node-input-addr-label"><i class="fa fa-list"></i> Address</label>
-        <input type="text" id="node-input-addr" placeholder="destination ip" style="width: 70%;">
+        <input type="text" id="node-input-addr" placeholder="destination ip" style="width: 50%;">
+        <select id="node-input-ipv" style="width:70px">
+          <option value="udp4">ipv4</option>
+          <option value="udp6">ipv6</option>
+        </select>
     </div>
     <div class="form-row node-input-iface">
         <label for="node-input-iface"><i class="fa fa-random"></i> Interface</label>
@@ -167,6 +179,7 @@
             addr: {value:""},
             iface: {value:""},
             port: {value:""},
+            ipv: {value:"udp4"},
             outport: {value:""},
             base64: {value:false,required:true},
             multicast: {value:"false"}
diff --git a/nodes/core/io/32-udp.js b/nodes/core/io/32-udp.js
index 5652fd184..19209a088 100644
--- a/nodes/core/io/32-udp.js
+++ b/nodes/core/io/32-udp.js
@@ -26,9 +26,10 @@ module.exports = function(RED) {
         this.datatype = n.datatype;
         this.iface = n.iface || null;
         this.multicast = n.multicast;
+        this.ipv = n.ipv || "udp4";
         var node = this;
 
-        var server = dgram.createSocket('udp4');
+        var server = dgram.createSocket(node.ipv);  // default to ipv4
 
         server.on("error", function (err) {
             if ((err.code == "EACCES") && (node.port < 1024)) {
@@ -83,7 +84,7 @@ module.exports = function(RED) {
 
         // Hack for when you have both in and out udp nodes sharing a port
         //   if udp in starts last it shares better - so give it a chance to be last
-        setTimeout( function() { server.bind(node.port,node.iface); }, 250);;
+        setTimeout( function() { server.bind(node.port,node.iface); }, 250);
     }
     RED.nodes.registerType("udp in",UDPin);
 
@@ -98,9 +99,10 @@ module.exports = function(RED) {
         this.addr = n.addr;
         this.iface = n.iface || null;
         this.multicast = n.multicast;
+        this.ipv = n.ipv || "udp4";
         var node = this;
 
-        var sock = dgram.createSocket('udp4');  // only use ipv4 for now
+        var sock = dgram.createSocket(node.ipv);  // default to ipv4
 
         if (node.multicast != "false") {
             if (node.outport == "") { node.outport = node.port; }