diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc
index 599d56e31..00454bc6a 100644
--- a/mswin32/nmap.rc
+++ b/mswin32/nmap.rc
@@ -12,7 +12,7 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 4,22,0,7
+FILEVERSION 4,23,0,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -29,7 +29,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Insecure.Org\0"
             VALUE "FileDescription", "Nmap\0"
-            VALUE "FileVersion", "4.22SOC7\0"
+            VALUE "FileVersion", "4.23RC3\0"
             VALUE "InternalName", "Nmap\0"
             VALUE "LegalCopyright", "Copyright (c) Insecure.Com LLC (fyodor@insecure.org)\0"
             VALUE "LegalTrademarks", "NMAP\0"
diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln
index 96684aef7..e86158496 100644
--- a/mswin32/nmap.sln
+++ b/mswin32/nmap.sln
@@ -1,12 +1,13 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}"
 	ProjectSection(ProjectDependencies) = postProject
-		{B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F}
-		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} = {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}
-		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} = {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}
-		{5DE86C7A-DE72-4265-8807-4CA38F94F22A} = {5DE86C7A-DE72-4265-8807-4CA38F94F22A}
+		{FB7F6FD2-A39D-40A1-86DD-9B08370BDEA6} = {FB7F6FD2-A39D-40A1-86DD-9B08370BDEA6}
 		{31FB0767-A71F-4575-8379-002D72B8AF86} = {31FB0767-A71F-4575-8379-002D72B8AF86}
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A} = {5DE86C7A-DE72-4265-8807-4CA38F94F22A}
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C} = {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} = {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcproj", "{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}"
@@ -22,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnet", "..\libdnet-stripped
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\liblua\liblua.vcproj", "{31FB0767-A71F-4575-8379-002D72B8AF86}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nse_bitlib", "..\nselib\nse_bitlib.vcproj", "{FB7F6FD2-A39D-40A1-86DD-9B08370BDEA6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nse_bitlib", "..\nselib-bin\nse_bitlib.vcproj", "{FB7F6FD2-A39D-40A1-86DD-9B08370BDEA6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{31FB0767-A71F-4575-8379-002D72B8AF86} = {31FB0767-A71F-4575-8379-002D72B8AF86}
 	EndProjectSection
diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj
index 548593ee9..ce1e2f069 100644
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y "
+				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot;  /y"
 			/>
 		</Configuration>
 		<Configuration
@@ -202,7 +202,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y"
+				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot;  /y"
 			/>
 		</Configuration>
 	</Configurations>
@@ -310,11 +310,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\protocols.cc"
+				RelativePath="..\portreasons.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\portreasons.cc"
+				RelativePath="..\protocols.cc"
 				>
 			</File>
 			<File
@@ -499,11 +499,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\protocols.h"
+				RelativePath="..\portreasons.h"
 				>
 			</File>
 			<File
-				RelativePath="..\portreasons.h"
+				RelativePath="..\protocols.h"
 				>
 			</File>
 			<File
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index d2e333613..2c9bed38f 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -20,8 +20,8 @@
   ;Get installation folder from registry if available 
   InstallDirRegKey HKCU "Software\Nmap" "" 
  
-  !define VERSION "4.23RC1"  
-  VIProductVersion "4.23.0.1"
+  !define VERSION "4.23RC3"  
+  VIProductVersion "4.23.0.3"
   VIAddVersionKey /LANG=1033 "FileVersion" "${VERSION}"
   VIAddVersionKey /LANG=1033 "ProductName" "Nmap" 
   VIAddVersionKey /LANG=1033 "CompanyName" "Insecure.org" 
@@ -123,8 +123,9 @@ Section "Nmap Core Files" SecCore
   File ..\..\docs\nmap.xsl 
   File ..\nmap_performance.reg 
   File ..\..\README-WIN32 
-  File /r scripts 
+  File /r ..\..\scripts 
   File /r ..\Release\nselib
+  File /r ..\Release\nselib-bin
   File ..\icon1.ico 
   
   ;Store installation folder 
diff --git a/nselib-bin/nse_bitlib.vcproj b/nselib-bin/nse_bitlib.vcproj
index 275e5cd8b..99c02f936 100644
--- a/nselib-bin/nse_bitlib.vcproj
+++ b/nselib-bin/nse_bitlib.vcproj
@@ -93,7 +93,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot;  /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.dll&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot; /y"
+				CommandLine="xcopy &quot;$(SolutionDir)..\nselib-bin\*.dll&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib-bin\&quot; /y"
 			/>
 		</Configuration>
 		<Configuration
@@ -172,7 +172,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot;  /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.dll&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot; /y"
+				CommandLine="xcopy &quot;$(SolutionDir)..\nselib-bin\*.dll&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib-bin\&quot; /y"
 			/>
 		</Configuration>
 	</Configurations>