diff --git a/io/wol/39-wol.html b/io/wol/39-wol.html
index ebb09e60..feb46d13 100644
--- a/io/wol/39-wol.html
+++ b/io/wol/39-wol.html
@@ -4,16 +4,21 @@
         <label for="node-input-mac"><i class="fa fa-globe"></i> MAC Address</label>
         <input type="text" id="node-input-mac" placeholder="e.g. DE:AD:BE:EF:FE:ED">
     </div>
+    <div class="form-row">
+        <label for="node-input-host"><i class="fa fa-globe"></i> Host Address</label>
+        <input type="text" id="node-input-host" placeholder="e.g. 255.255.255.255">
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
-    <div class="form-tips">Tip: leave blank if you want to use <code>msg.mac</code> to dynamically set target mac address.</div>
+    <div class="form-tips">Tip: leave blank if you want to use <code>msg.mac</code> or <code>msg.host</code> to dynamically set target mac address.</div>
 </script>
 
 <script type="text/x-red" data-help-name="wake on lan">
     <p>Sends a Wake-On-LAN magic packet to the mac address specified.</p>
     <p>You may instead set <code>msg.mac</code> to dynamically set the target device mac to wake up.</p>
+    <p>The target host address can optionally be set using <code>msg.host</code></p>
 </script>
 
 <script type="text/javascript">
@@ -22,6 +27,7 @@
         color:"#999966",
         defaults: {
             mac: {value:""},
+            host: {value:""},
             name: {value:""}
         },
         inputs:1,
diff --git a/io/wol/39-wol.js b/io/wol/39-wol.js
index 9e7d002b..aee413be 100644
--- a/io/wol/39-wol.js
+++ b/io/wol/39-wol.js
@@ -7,14 +7,16 @@ module.exports = function(RED) {
     function WOLnode(n) {
         RED.nodes.createNode(this,n);
         this.mac = n.mac.trim();
+        this.host = n.host;
         var node = this;
 
         this.on("input", function(msg) {
             var mac = this.mac || msg.mac || null;
+            var host = this.host || msg.host || '255.255.255.255';
             if (mac != null) {
                 if (chk.test(mac)) {
                     try {
-                        wol.wake(mac, function(error) {
+                        wol.wake(mac, {address: host}, function(error) {
                             if (error) { node.warn(error); }
                             else if (RED.settings.verbose) {
                                 node.log("sent WOL magic packet");
diff --git a/io/wol/package.json b/io/wol/package.json
index 70902ebf..d233e41c 100644
--- a/io/wol/package.json
+++ b/io/wol/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-wol",
-    "version"       : "0.0.7",
+    "version"       : "0.0.8",
     "description"   : "A Node-RED node to send Wake-On-LAN (WOL) magic packets",
     "dependencies"  : {
         "wake_on_lan"   : "0.0.4"