--- NmapOps.cc.orig	Mon May  5 10:43:45 2008
+++ NmapOps.cc	Mon May 12 01:29:49 2008
@@ -374,6 +374,10 @@
 
  if (pingscan && (TCPScan() || UDPScan() || ipprotscan || listscan)) {
    fatal("Ping scan is not valid with any other scan types (the other ones all include a ping scan");
+ }
+
+ if (af() == AF_INET6 && (PINGTYPE_ICMP_PING || PINGTYPE_ICMP_MASK || PINGTYPE_ICMP_TS)) {
+   fatal("ICMP Echo, Timestamp and Address Mask pings are only valid for IPv4.");
  }
 
  if (sendpref == PACKET_SEND_NOPREF) {