diff --git a/lib/packet.js b/lib/packet.js
index 26ff201..cbc57d3 100644
--- a/lib/packet.js
+++ b/lib/packet.js
@@ -45,9 +45,9 @@ function PacketFactory(protocol, configuration, _) {
             packet.fname = bootFileName;
 
             // Necessary, at least on vbox
-            packet.siaddr = configuration.get('dhcpGateway', '10.1.1.1');
+            packet.siaddr = configuration.get('tftpBindAddress', '10.1.1.1');
             // Not necessary, at least on vbox, but perhaps other clients will require these fields?
-            packet.sname = configuration.get('dhcpGateway', '10.1.1.1');
+            packet.sname = configuration.get('tftpBindAddress', '10.1.1.1');
 
             //EFI PXE listen on a different port => tell the server
             if ((packet.options.userClass === undefined) &&
diff --git a/spec/lib/packet-spec.js b/spec/lib/packet-spec.js
index 1cf27e8..6ddae19 100644
--- a/spec/lib/packet-spec.js
+++ b/spec/lib/packet-spec.js
@@ -73,7 +73,7 @@ describe("Packet", function() {
 
         it("should create a proper ACK packet for proxyDHCP", function() {
             var testbootfile = 'testbootfile';
-            configuration.get.withArgs('dhcpGateway').returns('10.1.1.1');
+            configuration.get.withArgs('tftpBindAddress').returns('10.1.1.1');
             configuration.get.withArgs('broadcastaddr').returns('10.1.1.255');
 
             packetUtil.createProxyDhcpAck(testPacket, testbootfile);