diff --git a/CHANGELOG b/CHANGELOG
index e30d65897..77d56cba9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -108,6 +108,12 @@ o [NSE] Our http library no longer allows cached responses from a GET
   request to be returned for a HEAD request. This could cause problems
   with at least the http-enum script. [David]
 
+o Fixed a bug in the WinPcap installer: If the "Start the WinPcap
+  service 'NPF' at startup" box was unchecked and the "Start the
+  WinPcap service 'NPF' now" box was checked, the second checkbox
+  would be ignored (the service would not be started now). [Rob
+  Nicholls]
+
 Nmap 5.10BETA2 [2009-12-24]
 
 o Added 7 new NSE scripts for a grand total of 79! You can learn about
diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 29afe75a8..3b655816d 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -266,8 +266,9 @@ FunctionEnd
 
 Function doOptions
   ReadINIStr $0 "$PLUGINSDIR\options.ini" "Field 1" "State"
-  StrCmp $0 "0" do_options_end
+  StrCmp $0 "0" do_options_next
   WriteRegDWORD HKLM "SYSTEM\CurrentControlSet\Services\NPF" "Start" 2
+  do_options_next:
   ReadINIStr $0 "$PLUGINSDIR\options.ini" "Field 2" "State"
   StrCmp $0 "0" do_options_end
   nsExec::Exec "net start npf"