diff --git a/CHANGELOG b/CHANGELOG
index c715d1d94..8d2961ba4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,8 +14,9 @@ o Patched libdnet to include sys/uio.h in src/tun-linux.c.  This is
 
 o Fixed a crash which could occur when a ridiculously short
   --host_timeout was specified on Windows (or on UNIX if --send_eth was
-  specified).  Thanks to Ole Morten Grodaas (grodaas(a)gmail.com) for
-  discovering the problem.
+  specified).  Nmap now also prints a warning if you specify a
+  host_timeout of less than 1 second.  Thanks to Ole Morten Grodaas
+  (grodaas(a)gmail.com) for discovering the problem.
 
 Nmap 3.91
 
diff --git a/Makefile.in b/Makefile.in
index f4639d099..ca8a18380 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 3.92
+export NMAP_VERSION = 3.93
 NMAP_NAME= nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index f2ab3802d..19afab4f8 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -104,7 +104,7 @@
 #ifndef NMAP_WINCONFIG_H
 #define NMAP_WINCONFIG_H
 
-#define NMAP_VERSION "3.92"
+#define NMAP_VERSION "3.93"
 #define NMAP_NAME "nmap"
 #define NMAP_URL "http://www.insecure.org/nmap"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
diff --git a/targets.cc b/targets.cc
index 1c77803f5..c373ba19a 100644
--- a/targets.cc
+++ b/targets.cc
@@ -428,7 +428,7 @@ if (hs->randomize) {
  /* Then we do the mass ping (if required - IP-level pings) */
  if ((*pingtype == PINGTYPE_NONE && !arpping_done) || hs->hostbatch[0]->ifType() == devt_loopback) {
    for(i=0; i < hs->current_batch_sz; i++)  {
-     if (hs->hostbatch[i]->timedOut(&now)) {
+     if (!hs->hostbatch[i]->timedOut(&now)) {
        initialize_timeout_info(&hs->hostbatch[i]->to);
        hs->hostbatch[i]->flags |= HOST_UP; /*hostbatch[i].up = 1;*/
      }
@@ -1178,7 +1178,7 @@ int get_ping_results(int sd, pcap_t *pd, Target *hostbatch[], int pingtype,
   int dotimeout = 1;
   int newstate = HOST_DOWN;
   int foundsomething;
-  unsigned short newport;
+  unsigned short newport = 0;
   int newportstate; /* Hack so that in some specific cases we can determine the 
 		       state of a port and even skip the real scan */
   u32 trynum = 0xFFFFFF;
@@ -1206,7 +1206,6 @@ int get_ping_results(int sd, pcap_t *pd, Target *hostbatch[], int pingtype,
   else sportbase = o.magic_port + 20;
 
   gettimeofday(&start, NULL);
-  newport = 0;
   newportstate = PORT_UNKNOWN;
 
   while(pt->block_unaccounted > 0 && !timeout) {