diff --git a/todo/nmap.txt b/todo/nmap.txt
index 273fc2a4b..d1a78e523 100644
--- a/todo/nmap.txt
+++ b/todo/nmap.txt
@@ -8,13 +8,15 @@ o Make the release
 
 ==Things needed for next STABLE release go ABOVE THIS LINE==
 
-o Right now, when an IPv4 or IPv6 address seems bogus (such as 1.2.3
-  or 2001::0 in IPv4 mode), we give a fatal error and abort the scan.
-  But since that might just be one bad target in a long list of hosts to
-  be scanned, it is probably better to just print a warning and
-  continue.  Some sort of warning or host element should be included in
-  the XML to explain what happened too.  This should also happen if
-  we're unable to resolve a DNS name.
+o In Nmap XML output, osclass (OS Classification) tags should be
+  children of osmatch (the human readable OS name line) rather than
+  having Nmap deduplicate all the osclasses and put them in as
+  siblings.  But this change might break some systems which utilize
+  Nmap XML output, so, along with this change, we need to introduce an
+  option such as --deprecated-osclass-xml to return the old behavior.
+  That option only needs to be documented in the CHANGELOG entry
+  referring to this change, and it should note that we're likely to
+  remove this option in a year or two.
 
 o Migrate web.insecure.org to a RHEL-6 derived distro (probably CENTOS
   6, since Linode doesn't currently offer ScientificLinux images).
@@ -730,6 +732,14 @@ o random tip database
 
 DONE:
 
+o Right now, when an IPv4 or IPv6 address seems bogus (such as 1.2.3
+  or 2001::0 in IPv4 mode), we give a fatal error and abort the scan.
+  But since that might just be one bad target in a long list of hosts to
+  be scanned, it is probably better to just print a warning and
+  continue.  Some sort of warning or host element should be included in
+  the XML to explain what happened too.  This should also happen if
+  we're unable to resolve a DNS name.
+
 o In sv-tidy, check that used references start at 1 and are
   contiguous. If $1 and $3 are used but not $2, it's probably a bug.
   Maybe you can even find out how many there should be by inspecting