diff --git a/CHANGELOG b/CHANGELOG
index 80a0c57a1..f92fdc633 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,11 @@ o Updated the LibPCRE build system to add the -fno-thread-jumps option
   people have reported on such systems.  Thanks to Kurt Grutzmacher
   (grutz(a)jingojango.net) for sending the configure.ac patch.
 
+o Increased a write buffer length to avoid Nmap from quitting with the
+  message "log_vwrite: write buffer not large enough -- need to
+  increase".  Thanks to Dave (dmarcher(a)pobox.com) for reporting the
+  issue.
+
 Nmap 4.02ALPHA2
 
 o Updated to a newer XSL stylesheet (for XML to HTML output
diff --git a/Makefile.in b/Makefile.in
index 99c6b5de6..fa950d9cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-export NMAP_VERSION = 4.02Alpha2
+export NMAP_VERSION = 4.02CSW
 NMAP_NAME= Nmap
 NMAP_URL= http://www.insecure.org/nmap/
 NMAP_PLATFORM=@host@
diff --git a/docs/nmap.1 b/docs/nmap.1
index bbbe8127a..8e181bd0b 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" "03/08/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "04/01/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -39,11 +39,11 @@ when it cannot determine which of the two states describe a port. The port table
 In addition to the interesting ports table, Nmap can provide further information on targets, including reverse DNS names, operating system guesses, device types, and MAC addresses.
 .PP
 A typical Nmap scan is shown in
-Example\ 14.1, \(lqA representative Nmap scan\(rq. The only Nmap arguments used in this example are
+Example\ 13.1, \(lqA representative Nmap scan\(rq. The only Nmap arguments used in this example are
 \fB\-A\fR, to enable OS and version detection,
 \fB\-T4\fR
 for faster execution, and then the two target hostnames.
-Example\ 14.1.\ A representative Nmap scan.sp
+Example\ 13.1.\ A representative Nmap scan.sp
 .nf
 # nmap \-A \-T4 scanme.nmap.org playground
 
@@ -749,7 +749,7 @@ or
 \fB\-A\fR.
 .TP
 \fB\-\-osscan\-guess\fR; \fB\-\-fuzzy\fR (Guess OS detection results)
-When Nmap is unable to detect a perfect OS match, it sometimes offers up near\-matches as possibilities. The match has to be very close for Nmap to do this by default. Either of these (equivalent) options make Nmap guess more aggressively.
+When Nmap is unable to detect a perfect OS match, it sometimes offers up near\-matches as possibilities. The match has to be very close for Nmap to do this by default. Either of these (equivalent) options make Nmap guess more aggressively. Nmap will still tell you when an imperfect match is printed and display its confidence level (percentage) for each guess.
 .SH "TIMING AND PERFORMANCE"
 .PP
 One of my highest Nmap development priorities has always been performance. A default scan (\fBnmap \fR\fB\fIhostname\fR\fR) of a host on my local network takes a fifth of a second. That is barely enough time to blink, but adds up when you are scanning tens or hundreds of thousands of hosts. Moreover, certain scan options such as UDP scanning and version detection can increase scan times substantially. So can certain firewall configurations, particularly response rate limiting. While Nmap utilizes parallelism and many advanced algorithms to accelerate these scans, the user has ultimate control over how Nmap runs. Expert users carefully craft Nmap commands to obtain only the information they care about while meeting their time constraints.
@@ -974,7 +974,7 @@ options (they are equivalent) to exploit these weaknesses. Simply provide a port
 flag because Nmap relies on system libraries to handle those. Most TCP scans, including SYN scan, support the option completely, as does UDP scan.
 .TP
 \fB\-\-data\-length <number>\fR (Append random data to sent packets)
-Normally Nmap sends minimalist packets containing only a header. So its TCP packets are generally 40 bytes and ICMP echo requests are just 28. This option tells Nmap to append the given number of random bytes to most of the packets it sends. OS detection (\fB\-O\fR) packets are not affected, but most pinging and portscan packets are. This slows things down, but can make a scan slightly less conspicuous.
+Normally Nmap sends minimalist packets containing only a header. So its TCP packets are generally 40 bytes and ICMP echo requests are just 28. This option tells Nmap to append the given number of random bytes to most of the packets it sends. OS detection (\fB\-O\fR) packets are not affected because accuracy there requires probe consistency, but most pinging and portscan packets support this. It slows things down a little, but can make a scan slightly less conspicuous.
 .TP
 \fB\-\-ttl <value>\fR (Set IP time\-to\-live field)
 Sets the IPv4 time\-to\-live field in sent packets to the given value.
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index d3538fe2b..cfb7ee136 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.02Alpha2 ( http://www.insecure.org/nmap/ )
+Nmap 4.02CSW ( 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/nmap_winconfig.h b/nmap_winconfig.h
index ccc3f9adb..456fc768e 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -104,7 +104,7 @@
 #ifndef NMAP_WINCONFIG_H
 #define NMAP_WINCONFIG_H
 
-#define NMAP_VERSION "4.02Alpha2"
+#define NMAP_VERSION "4.02CSW"
 #define NMAP_NAME "Nmap"
 #define NMAP_URL "http://www.insecure.org/nmap"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
diff --git a/output.cc b/output.cc
index 60575a8e7..fa61b826b 100644
--- a/output.cc
+++ b/output.cc
@@ -663,7 +663,7 @@ char* xml_convert (const char* str) {
    va_start() AND va_end() calls. */
 void log_vwrite(int logt, const char *fmt, va_list ap) {
   static char *writebuf = NULL;;
-  int writebuflen = 8192;
+  int writebuflen = 65536;
   bool skid_noxlate = false;
   int rc = 0;
   int len;
diff --git a/scripts/sign_release.pl b/scripts/sign_release.pl
index b6a6a01ba..0a1fe7e09 100755
--- a/scripts/sign_release.pl
+++ b/scripts/sign_release.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 sub usage() {
     print "sign_release.pl <distdir>\n";