diff --git a/CHANGELOG b/CHANGELOG
index aba029946..7b389160f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,10 @@ o Added IP options support.  This allows you to specify loose/strict
   further details on using these advanced options.  Thanks to Marek Majkowski
   (majek(a)forest.one.pl) for this patch.
 
+o Updated the Windows installer to give an option checkbox for
+  performing the Nmap performance registry changes.  The default is to
+  do so.  Thanks to Adam Vartanian (flooey(a)gmail.com) for the patch.
+
 o Applied several code cleanup patches from Marek Majkowski.
 
 o Fixed a bug related to bogus completion time estimates when you
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 6bbd2c081..8be7a2119 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -85,6 +85,10 @@ Section "WinPcap 3.1" SecWinPcap
   Delete "$INSTDIR\winpcap-nmap-3.1.B.exe"
 SectionEnd
 
+Section "Networking Changes" SecPerfRegistryMods
+  File nmap_performance.reg
+  Exec 'regedt32 /S "$INSTDIR\nmap_performance.reg"'
+SectionEnd
 
 ;--------------------------------
 ;Descriptions
@@ -93,12 +97,14 @@ SectionEnd
   LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executables and script files"
   LangString DESC_SecRegisterPath ${LANG_ENGLISH} "Registers Nmap path to System path"
   LangString DESC_SecWinPcap ${LANG_ENGLISH} "Installs WinPcap 3.1"
+  LangString DESC_SecPerfRegistryMods ${LANG_ENGLISH} "Modifies Windows networking parameters to improve performance of TCP connect scans."
 
   ;Assign language strings to sections
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} $(DESC_SecCore)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecRegisterPath} $(DESC_SecRegisterPath)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecWinPcap} $(DESC_SecWinPcap)
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecPerfRegistryMods} $(DESC_SecPerfRegistryMods)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 ;--------------------------------
 ;Uninstaller Section