diff --git a/CHANGELOG b/CHANGELOG
index 9ddac2ea7..62e417258 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,16 @@
 # Nmap Changelog ($Id$)
 
+o Applied another VS 2005 compatability patch from KX (kxmail(a)gmail.com).
+
+o Fixed a compilation problem on Mac OS X and perhaps other platforms
+  with a one-line fix to scan_engine.cc.  Thanks to Felix Gröbert
+  (felix(a)groebert.org) for notifying me of the problem.
+
+o Define INET_ADDRSTRLEN in tcpip.h if the system doesn't define it
+  for us.  This apparently aids compilation on Solaris 2.6 and 7.
+  Thanks to Albert Chin (nmap-hackers(a)mlists.thewrittenword.com) for
+  sending the patch..
+
 3.94ALPHA2
 
 o Put Nmap on a diet, with changes to the core port scanning routine
@@ -8,7 +19,7 @@ o Put Nmap on a diet, with changes to the core port scanning routine
 
 o Fixed a problem with the -S and option on Windows reporting "Failed
   to resolve/decode supposed IPv4 source address".  The -D (decoy)
-  option was probably broken on that platform too.  Thanks to kx
+  option was probably broken on that platform too.  Thanks to KX
   (kxmail(a)gmail.com) for reporting the problem and tracking down a
   potential solution.
 
@@ -18,7 +29,7 @@ o Better handle ICMP type 3, code 0 (network unreachable) responses to
 
 o Applied some small fixes so that Nmap compiles with Visual C++
   2005 Express, which is free from Microsoft at
-  http://msdn.microsoft.com/vstudio/express/visualc/ .  Thanks to kx
+  http://msdn.microsoft.com/vstudio/express/visualc/ .  Thanks to KX
   (kxmail(a)gmail.com) and Sina Bahram (sbahram(a)nc.rr.com)
 
 o Removed foreign translations of the old man page from the
diff --git a/docs/nmap.1 b/docs/nmap.1
index 5ec85a03f..d527f59e5 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" "11/29/2005" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "12/04/2005" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -230,7 +230,7 @@ If no host discovery options are given, Nmap sends a TCP ACK packet destined for
 \fBconnect()\fR
 system call. These defaults are equivalent to the
 \fB\-PA \-PE\fR
-options. This host discovery is often sufficent when scanning local networks, but a more comprehensive set of discovery probes is recommended for security auditing.
+options. This host discovery is often sufficient when scanning local networks, but a more comprehensive set of discovery probes is recommended for security auditing.
 .PP
 The
 \fB\-P*\fR
diff --git a/scan_engine.cc b/scan_engine.cc
index f0e1b0a37..8be3eedc2 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -680,7 +680,7 @@ void UltraProbe::setARP(u8 *arppkt, u32 arplen) {
 void UltraProbe::setIP(u8 *ippacket, u32 iplen, const probespec *pspec) {
   struct ip *ipv4 = (struct ip *) ippacket;
   struct tcphdr *tcp = NULL;
-  struct udphdr_bsd *udp = NULL;
+  udphdr_bsd *udp = NULL;
 
   type = UP_IP;
   if (ipv4->ip_v != 4)
diff --git a/tcpip.h b/tcpip.h
index 7f98cbe40..c9d992358 100644
--- a/tcpip.h
+++ b/tcpip.h
@@ -258,6 +258,11 @@ typedef enum { devt_ethernet, devt_loopback, devt_p2p, devt_other  } devtype;
 #define TH_CWR        0x80
 #endif
 
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
+
 /* Used for tracing all packets sent or received (eg the
    --packet_trace option) */
 class PacketTrace {