diff --git a/CHANGELOG b/CHANGELOG
index 75a6c9adf..dce818f09 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed an error that showed itself on Windows when attempting
+  to scan localhost as an unprivileged user (nmap --unprivileged
+  localhost). The error looked like
+Skipping SYN Stealth Scan against localhost (127.0.0.1) because Windows does not support scanning your own machine (localhost) this way.
+  Now connect scan is used instead of SYN scan.
+
 o Fixed an output problem that showed itself on Windows when attempting
   to scan localhost, which is skipped. The problem looked like
     All 0 scanned ports on 127.0.0.1 are 
diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc
index 4e5e3c0cc..a4749e83a 100644
--- a/mswin32/winfix.cc
+++ b/mswin32/winfix.cc
@@ -194,7 +194,8 @@ void win_init()
 		}
 #endif
 
-	o.isr00t = pcap_avail;
+	if (!pcap_avail)
+		o.isr00t = 0;
 	atexit(win_cleanup);
 }