diff --git a/CHANGELOG b/CHANGELOG
index 478fca24f..5265f214a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -41,7 +41,7 @@ o Integrated all of your submissions (about a thousand) from the first
Many of the already existing match lines were improved too. Thanks
to Version Detection Czar Doug Hoyte for doing this.
-o Nmap now allows multiple ingored port states. If a 65K-port scan
+o Nmap now allows multiple ignored port states. If a 65K-port scan
had, 64K filtered ports, 1K closed ports, and a few dozen open
ports, Nmap used to list the dozen open ones among a thousand lines
of closed ports. Now Nmap will give reports like "Not shown: 64330
diff --git a/docs/nmap.1 b/docs/nmap.1
index f4fe9930c..6276a4d3e 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,7 +2,7 @@
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "NMAP" "1" "05/31/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "06/12/2006" "" "Nmap Reference Guide"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index a187e527f..3d02f4007 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.04BETA1 ( http://www.insecure.org/nmap/ )
+Nmap 4.10 ( http://www.insecure.org/nmap/ )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc.
diff --git a/mswin32/Makefile b/mswin32/Makefile
index 7aea59c5e..fe8f56821 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -1,10 +1,11 @@
MAKENSIS=/c/apps/NSIS/makensis.exe
VCEXPRESS="/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/VCExpress.exe"
NMAP_VERSION:=$(shell grep "export NMAP_VERSION " ../Makefile.in | cut "-d " -f4)
+LOGLOC=c:nmapbuild.log
winbuild:
# VCExpress.exe is devenv.com with the commercial Visual Studio suite instead of VC++ Express
- $(VCEXPRESS) nmap.sln /build release /log nmapbuild.log
+ $(VCEXPRESS) nmap.sln /build release /log $(LOGLOC)
$(MAKENSIS) winpcap/winpcap-nmap.nsi
rm -rf nmap-$(NMAP_VERSION)
mkdir nmap-$(NMAP_VERSION)
diff --git a/nmap-service-probes b/nmap-service-probes
index 87d1705ba..b596ee7a8 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -3053,7 +3053,7 @@ match http m|^HTTP/1\.0 401 Unauthorized\r\nServer: \r\nDate: .*\r\nWWW-Authenti
match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: NetPort Software ([\d.]+)\r\n.*Connection Information|s p/Efficient Networks Speedstream DSL router http config/ d/router/
match http m|^HTTP/1\.1 \d\d\d .*\r\nServer: NetPort Software ([\d.]+)\r\n| i/NetPort embedded httpd $1/
match http m|^HTTP/1\.1 400 Bad Request\r\nContent-Type: text/html\r\nDate: .*\r\nContent-Length: \d+\r\nVia: [\d.]+ Application and Content Networking System Software ([\d.]+)\r\n| p/Cisco ACNS http cache/ v/$1/ o/IOS/
-match http m|^HTTP/1\.0 \d\d\d .*.*Application and Content Networking System Software ([\d.]+)\)\n