diff --git a/CHANGELOG b/CHANGELOG
index 6fc31c952..01ed726e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Nsock] Fixed compilation on Windows XP by restricting the use
+  of the poll engine to Vista and later. [Gisle Vanem]
+
 o [NSE] Added support for ECDSA keys to ssh-hostkey.nse. [Adam Števko]
 
 o [Nsock] Added new poll and kqueue engines. [Henri Doreau]
diff --git a/nsock/include/nsock_winconfig.h b/nsock/include/nsock_winconfig.h
index b9c4c024d..d8fc8ca64 100644
--- a/nsock/include/nsock_winconfig.h
+++ b/nsock/include/nsock_winconfig.h
@@ -97,6 +97,9 @@
 #define HAVE_PCAP 1
 #endif
 
+ /* WSAPoll() isn't available before Vista */
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
 #define HAVE_POLL 1
+#endif
 
 #endif /* NSOCK_WINCONFIG_H */