--- nmap-6.47.orig/scan_engine.cc	2014-11-04 10:26:59.974973299 +0000
+++ nmap-6.47/scan_engine.cc	2014-11-04 11:04:49.419111175 +0000
@@ -954,7 +954,7 @@
     sctp = (struct sctp_hdr *) data;
     probes.IP.pd.sctp.sport = ntohs(sctp->sh_sport);
     probes.IP.pd.sctp.vtag = ntohl(sctp->sh_vtag);
-  } else if (hdr == IPPROTO_ICMP) {
+  } else if (hdr == IPPROTO_ICMP || hdr == IPPROTO_ICMPV6) {
     icmp = (struct ppkt *) data;
     probes.IP.pd.icmp.ident = ntohs(icmp->id);
   }