diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln
index ea93b1e52..3364332e8 100644
--- a/mswin32/nmap.sln
+++ b/mswin32/nmap.sln
@@ -24,11 +24,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinear", "..\liblinear\liblinear.vcxproj", "{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap-update", "..\nmap-update\nmap-update.vcxproj", "{BBF27339-C7B6-4F52-B742-897796C1F13B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Ncat Static|Win32 = Ncat Static|Win32
 		Release|Win32 = Release|Win32
+		With nmap-update|Win32 = With nmap-update|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -36,55 +39,80 @@ Global
 		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32
 		{361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32
+		{361719F0-AB42-4C93-9DE8-7D2144B96625}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{361719F0-AB42-4C93-9DE8-7D2144B96625}.With nmap-update|Win32.Build.0 = Release|Win32
 		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.Build.0 = Debug|Win32
 		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.ActiveCfg = Static|Win32
 		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.Build.0 = Static|Win32
 		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32
 		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.With nmap-update|Win32.Build.0 = Release|Win32
 		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.Build.0 = Debug|Win32
 		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32
 		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{5DE86C7A-DE72-4265-8807-4CA38F94F22A}.With nmap-update|Win32.Build.0 = Release|Win32
 		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.Build.0 = Debug|Win32
 		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.ActiveCfg = Static|Win32
 		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.Build.0 = Static|Win32
 		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32
 		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{B630C8F7-3138-43E8-89ED-78742FA2AC5F}.With nmap-update|Win32.Build.0 = Release|Win32
 		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.Build.0 = Debug|Win32
 		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32
 		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.With nmap-update|Win32.Build.0 = Release|Win32
 		{31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.ActiveCfg = Debug|Win32
 		{31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.Build.0 = Debug|Win32
 		{31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.ActiveCfg = Release|Win32
 		{31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.Build.0 = Release|Win32
+		{31FB0767-A71F-4575-8379-002D72B8AF86}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{31FB0767-A71F-4575-8379-002D72B8AF86}.With nmap-update|Win32.Build.0 = Release|Win32
 		{C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.Build.0 = Debug|Win32
 		{C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.ActiveCfg = Static|Win32
 		{C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.Build.0 = Static|Win32
 		{C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.ActiveCfg = Release|Win32
 		{C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.Build.0 = Release|Win32
+		{C1E04411-E021-468B-83F1-CB624BBA7589}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{C1E04411-E021-468B-83F1-CB624BBA7589}.With nmap-update|Win32.Build.0 = Release|Win32
 		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.Build.0 = Debug|Win32
 		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.ActiveCfg = Release|Win32
 		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.Build.0 = Release|Win32
+		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.With nmap-update|Win32.Build.0 = Release|Win32
 		{99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.Build.0 = Debug|Win32
 		{99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.ActiveCfg = Release|Win32
 		{99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.Build.0 = Release|Win32
+		{99157C3F-39F6-4663-99D7-1D9C1484494E}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{99157C3F-39F6-4663-99D7-1D9C1484494E}.With nmap-update|Win32.Build.0 = Release|Win32
 		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.Build.0 = Debug|Win32
 		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.ActiveCfg = Release|Win32
 		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.Build.0 = Release|Win32
 		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.ActiveCfg = Release|Win32
 		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.Build.0 = Release|Win32
+		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.With nmap-update|Win32.Build.0 = Release|Win32
+		{BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.ActiveCfg = Release|Win32
+		{BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.ActiveCfg = Release|Win32
+		{BBF27339-C7B6-4F52-B742-897796C1F13B}.With nmap-update|Win32.ActiveCfg = Release|Win32
+		{BBF27339-C7B6-4F52-B742-897796C1F13B}.With nmap-update|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE