diff --git a/CHANGELOG b/CHANGELOG
index bd35ed827..478fca24f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+Nmap 4.10
+
 o Updated nmap-mac-prefixes to reflect the latest OUI DB from the IEEE
   (http://standards.ieee.org/regauth/oui/oui.txt) as of May 31, 2006.
   Also added a couple unregistered OUI's (for QEMU and Bochs)
@@ -18,6 +20,14 @@ o Made some AIX and HP-UX portability fixes to Libdnet and NmapFE.
   These were sent in by Peter O'Gorman
   (nmap-dev(a)mlists.thewrittenword.com).
 
+o When you do a UDP+TCP scan, the TCP ports are now shown first (in
+  numerical order), followed by the UDP ports (also in order).  This
+  contrasts with the old format which showed all ports together in
+  numerical order, regardless of protocol.  This was at first a "bug",
+  but then I started thinking this behavior may be better.  If you
+  have a preference for one format or the other, please post your
+  reasons to nmap-dev.
+
 o Changed mass_dns system to print a warning if it can't find any
   available DNS servers, but not quit like it used to.  Thanks to Doug
   Hoyte for the patch.
diff --git a/Makefile.in b/Makefile.in
index 6163af9e1..96dd0d88d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.04BETA1
+export NMAP_VERSION = 4.10
 NMAP_NAME= Nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@
diff --git a/nmap-service-probes b/nmap-service-probes
index 7adfccf55..87d1705ba 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -3637,7 +3637,8 @@ match lcdproc m|^huh\? Invalid command \"GET\"\n$| p/LCDProc screen interface da
 
 match mosmig m|^GET \0\0\0\0TP/1\.0\r\n$| p/OpenMosix Process Migration Service/ o/Linux/
 
-match msdtc m|^...\0..$|s p/Microsoft Distributed Transaction Coordinator/ o/Windows/
+# Wrongly matches SSH in some cases
+# match msdtc m|^...\0..$|s p/Microsoft Distributed Transaction Coordinator/ o/Windows/
 match msdtc m|^ERROR\n$|s p/Microsoft Distributed Transaction Coordinator/ i/error/ o/Windows/
 
 # MLDonkey 2.5
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index b4f734a77..5bac8ee35 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -106,7 +106,7 @@
 /* Without this, Windows will give us all sorts of crap about using functions
    like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
-#define NMAP_VERSION "4.04BETA1"
+#define NMAP_VERSION "4.10"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://www.insecure.org/nmap"
 #define NMAP_PLATFORM "i686-pc-windows-windows"