diff --git a/CHANGELOG b/CHANGELOG
index 4e41acd8d..c7998f5ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,11 @@ o Enhanced the radmind service detection signature and added a
   deprecated radmind port to nmap-services.  Thanks to Matt Selsky for
   the patch.
 
+o Fixed the NSIS installer so that it does not include some excess
+  files (mswin32/* and .svn).  Thanks to Alan Jones for reporting the
+  problem.
+
+
 4.23RC3
 
 o Zenmap now has a man page!  It isn't very long yet, but covers the
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 2c9bed38f..f6acdc023 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -123,9 +123,9 @@ Section "Nmap Core Files" SecCore
   File ..\..\docs\nmap.xsl 
   File ..\nmap_performance.reg 
   File ..\..\README-WIN32 
-  File /r ..\..\scripts 
-  File /r ..\Release\nselib
-  File /r ..\Release\nselib-bin
+  File /r /x mswin32 /x .svn ..\..\scripts
+  File /r /x mswin32 /x .svn ..\Release\nselib
+  File /r /x mswin32 /x .svn ..\Release\nselib-bin
   File ..\icon1.ico 
   
   ;Store installation folder 
@@ -169,7 +169,7 @@ Section "Network Performance Improvements (Registry Changes)" SecPerfRegistryMod
 SectionEnd 
 
 Section "Zenmap (GUI frontend)" SecZenmap
-  File /r ..\nmap-${VERSION}\zenmap
+  File /r /x mswin32 /x .svn ..\nmap-${VERSION}\zenmap
   StrCpy $zenmapset "true"
 SectionEnd