diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 1aef4328f..fad03c5a5 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -207,8 +207,10 @@ Function .onInit
       return
 
       silent_uninstall:
-        ; Our old UninstallString is present, should have quotes and uninstall.exe location
-        ; and should support a silent uninstall by passing /S to it.
+        ; Our InstalledBy string is present, UninstallString should have quotes and uninstall.exe location
+        ; and this file should support a silent uninstall by passing /S to it.
+        ; we could read QuietUninstallString, but this should be exactly the same as UninstallString with /S on the end.
+        ReadRegStr $0 "HKLM" "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString"
         ExecWait '$0 /S _?=$INSTDIR'
       return
 
diff --git a/todo/nmap.txt b/todo/nmap.txt
index 0466cf8ec..1bfb8e741 100644
--- a/todo/nmap.txt
+++ b/todo/nmap.txt
@@ -27,15 +27,6 @@ o Investigate a probe/response matching problem reported by QA Cafe
   Matthew Stickey and Joe McEachern of QA Cafe.  See this thread:
   http://seclists.org/nmap-dev/2011/q3/227
 
-o When our winpcap installer is run in silent mode
-  (e.g. "winpcap-nmap-4.12.exe /S"), it seems to execute nmap.exe if
-  that binary exists in the same directory.  This leads to a cmd.exe
-  window briefly poping up as Nmap displays its console help output.
-  Moving the Winpcap installer into its own subdir and running it from
-  there seems to fix this (because it then can't find nmap.exe to
-  run), but it would be better to determine why this is happening in
-  the first place and fix it.
-
 ==Things needed for next STABLE release go ABOVE THIS LINE==
 
 o We should document Ron's sample script