diff --git a/CHANGELOG b/CHANGELOG
index 359f17ce5..bdada03ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed a bug on Win32 problem which caused an infinite loop when Nmap
+  encountered certain broadcast addresses. [Dudi Itzhakov]
+
 o Fix MingW compilation by adding a signal.h include to
   main.cc. [Gisle Vanem]
 
diff --git a/scan_engine.cc b/scan_engine.cc
index ae1be27c2..69ec5c865 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -3356,6 +3356,9 @@ static bool do_one_select_round(UltraScanInfo *USI, struct timeval *stime) {
 	  newportstate = PORT_FILTERED;
 	  current_reason = ER_HOSTUNREACH;
 	  break;
+#ifdef WIN32
+	case WSAEADDRNOTAVAIL:
+#endif
 	case ETIMEDOUT:
 	case EHOSTDOWN:
 	  newhoststate = HOST_DOWN;