diff --git a/CHANGELOG b/CHANGELOG
index c51f8f947..475074679 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,9 @@ o Added the --spoof_mac option, which asks Nmap to use the given MAC
   "Apple", "0", "01:02:03:04:05:06", "deadbeefcafe", "0020F2", and
   "Cisco".
 
+o Fixed a but that would cause Nmap to ARP for a gateway MAC address
+  even when it was already in the system ARP cache.
+
 o Fixed a problem where Nmap compilation would use header files from
   the libpcap included with Nmap even when it was linking to a system
   libpcap.  Thanks to Solar Designer (solar(a)openwall.com) and Okan
diff --git a/Makefile.in b/Makefile.in
index e2ff3b9e1..f494bd723 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 3.83.SOC3
+export NMAP_VERSION = 3.83.DC13
 NMAP_NAME= nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@
diff --git a/scan_engine.cc b/scan_engine.cc
index 74dc7bfe7..3a2726db1 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -1930,7 +1930,7 @@ static UltraProbe *sendIPScanProbe(UltraScanInfo *USI, HostScanStats *hss,
 
   if (USI->ethsd) {
     memcpy(eth.srcmac, hss->target->SrcMACAddress(), 6);
-    memcpy(eth.dstmac, hss->target->MACAddress(), 6);
+    memcpy(eth.dstmac, hss->target->NextHopMACAddress(), 6);
     eth.ethsd = USI->ethsd;
     eth.devname[0] = '\0';
     ethptr = ð