diff --git a/todo/nmap.txt b/todo/nmap.txt
index 7b7e06fd9..c080df2c9 100644
--- a/todo/nmap.txt
+++ b/todo/nmap.txt
@@ -56,12 +56,45 @@ o Script review:
     http://seclists.org/nmap-dev/2010/q4/623
     http://seclists.org/nmap-dev/2010/q4/639
   - servicetags http://seclists.org/nmap-dev/2010/q4/691
+    needs new testing on OpenSolaris: http://seclists.org/nmap-dev/2011/q1/91
   - Martin Swende patch to force script run
     http://seclists.org/nmap-dev/2010/q4/567
+  - ssl-known_key http://seclists.org/nmap-dev/2010/q4/733
+    Thread continues at http://seclists.org/nmap-dev/2011/q1/26.
+  - firewalk-path http://seclists.org/nmap-dev/2011/q1/63
+  - quake3-master-getservers http://seclists.org/nmap-dev/2011/q1/64
+  - snmp-ios-config http://seclists.org/nmap-dev/2011/q1/10
+    Requires a TFTP server; decision was to build such server in Lua
+    if possible. Patrik Karlsson's beginning TFTP implementation:
+    http://seclists.org/nmap-dev/2011/q1/169.
 
 o [Nping] See whether --echo-client mode really requires root, and
   remove that restriction if not.
 
+o Investigate this interface-matching problem on Windows:
+  http://seclists.org/nmap-dev/2011/q1/52. It is related to the
+  libdnet changes we made to allow choosing the correct physical
+  interface when teamed interfaces share the same MAC.
+
+o [Nsock] Some SSL connections that used to work now fail; find out
+  why. http://seclists.org/nmap-dev/2010/q4/788. Narrowed down to
+  r19801 in http://seclists.org/nmap-dev/2011/q1/12.
+
+o [Zenmap] Make formerly open ports that are now closed or filtered
+  disappear from the "Ports / Hosts" tab. This appears to be related
+  to ignored states; if in the second scan I use -d2 so all ports are
+  included in the output, the interface is updated correctly.
+  http://seclists.org/nmap-dev/2010/q4/659
+
+o UDP scanning with IP options causes "Received short ICMP packet" on
+  receipt. http://seclists.org/nmap-dev/2011/q1/82
+
+o [Ncat] Find out what RDP port forwarding apparently doesn't work on
+  Windows. http://seclists.org/nmap-dev/2011/q1/86
+
+o Decide whether to include NSE console script help, decide on
+  implementation issues. http://seclists.org/nmap-dev/2011/q1/163
+
 o We should document Ron's sample script
   (http://nmap.org/svn/docs/sample-script.nse) in docs/scripting.xml so
   that new script writers know about it.