diff --git a/CHANGELOG b/CHANGELOG
index 27d13d32f..1fc5cc676 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed an error that could occur with ICMPv6 probes and -d4 debugging:
+  "Unexpected probespec2ascii type encountered" [David Fifield]
+
 o Fixed the routing table loop on OS X so that on-link routes appear.
   Previously, they were ignored so that things like ARP scan didn't
   work. [Patrik Karlsson, David Fifield]
diff --git a/scan_engine.cc b/scan_engine.cc
index 70fb4dc46..d0e7b965b 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -155,6 +155,8 @@ static const char *pspectype2ascii(int type) {
     return "ICMP";
   case PS_ARP:
     return "ARP";
+  case PS_ICMPV6:
+    return "ICMPv6";
   case PS_ND:
     return "ND";
   case PS_CONNECTTCP:
@@ -732,6 +734,10 @@ static char *probespec2ascii(const probespec *pspec, char *buf, unsigned int buf
   case PS_ARP:
     Snprintf(buf, bufsz, "ARP");
     break;
+  case PS_ICMPV6:
+    Snprintf(buf, bufsz, "icmpv6 type %d code %d",
+             pspec->pd.icmpv6.type, pspec->pd.icmpv6.code);
+    break;
   case PS_ND:
     Snprintf(buf, bufsz, "ND");
     break;