diff --git a/CHANGELOG b/CHANGELOG
index 27c57b5ac..676178f18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,9 @@ o Fixed the nmap_command_path bug in Zenmap. The variable now actually
   by a new class in UmitConf called PathsConfig, which represents the
   [paths] section in zenmap.conf. [Jurand Nogiec]
 
+o Fixed a bug which caused -PN to erronously bail out for unprivileged
+  users.  Thanks to Jabra (jabra(a)spl0it.org) for the report. [Kris]
+
 o Fixed an integer overflow which prevented a target specification
   of "*.*.*.*" from working.  Support for the CIDR /0 is now also
   available. [Kris]
diff --git a/nmap.cc b/nmap.cc
index 5f66ce6f3..f710cf7b7 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -468,7 +468,7 @@ void validate_scan_lists(scan_lists &ports, NmapOps &o){
 		assert(ports.ack_ping_count > 0);
 	}
 
-	if (!o.isr00t || o.pf() != PF_INET) {
+	if ((o.pingtype & PINGTYPE_TCP) && (!o.isr00t || o.pf() != PF_INET)) {
     		// We will have to do a connect() style ping 
 		if (ports.syn_ping_count && ports.ack_ping_count) {
 			fatal("Cannot use both SYN and ACK ping probes if you are nonroot or using IPv6");