diff --git a/CHANGELOG b/CHANGELOG
index e05b58b04..d48646597 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,21 +1,29 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+4.52
+
 o Fixed Nmap Winpcap installer to use CurrentVersion registry key on
   Windows rather than VersionNumber to more reliably detect Vista
   machines.  This should prevent the XP version of Packet.dll from
   being installed on Vista. [Rob Nicholls]
 
+o The Nmap Scripting Engine (NSE) now supports run-time interaction
+  and the Nmap --host-timeout option. [Doug]
+
 o Added nmap.fetchfile() function for scripts so they can easily find
-  Nmap's nmap-* data files. [Kris]
+  Nmap's nmap-* data files (such as the OS/version detection DBs, port
+  number mapping, etc.) [Kris]
 
 o Updated rpcinfo.nse to use nmap.fetchfile() to read from nmap-rpc
   instead of having a huge table of RPC numbers.  This reduced the
-  script's size by nearly 3/4. [Kris]
+  script's size by nearly 75%. [Kris]
 
 o Fixed multiple NSE scripts that weren't always properly closing their
   sockets.  The error message was:
-    "bad argument #1 to 'close' (nsock expected, got no value)"
-  [Kris]
+  "bad argument #1 to 'close' (nsock expected, got no value)" [Kris]
+
+o Added a new version detection probe for the Trend Micro OfficeScan
+  product line. [Tom Sellers]
 
 4.51BETA
 
diff --git a/docs/nmap.1 b/docs/nmap.1
index da6a62ea1..fb6b5737a 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -102,7 +102,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .sp
 .RS 4
 .nf
-Nmap 4\.51BETA ( http://insecure\.org )
+Nmap 4\.52 ( http://insecure\.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\.
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 2a6d6e710..26ceb8e74 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.51BETA ( http://insecure.org )
+Nmap 4.52 ( http://insecure.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index 5296e145d..c197611e9 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -1,11 +1,11 @@
 .\"     Title: zenmap
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 12/21/2007
+.\"      Date: 01/01/2008
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "ZENMAP" "1" "12/21/2007" "" ""
+.TH "ZENMAP" "1" "01/01/2008" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -18,6 +18,10 @@ zenmap - Graphical Nmap frontend and results viewer
 .SH "DESCRIPTION"
 .PP
 Zenmap is a multi\-platform graphical Nmap frontend and results viewer\. Zenmap aims to make Nmap easy for beginners to use while giving experienced Nmap users advanced features\. Frequently used scans can be saved as profiles to make them easy to run repeatedly\. A command creator allows interactive creation of Nmap command lines\. Scan results can be saved and viewed later\. Saved scan results can be compared with one another to see how they differ\. The results of recent scans are stored in a searchable database\.
+.PP
+This man page only describes the few Zenmap command\-line options and some critical notes\. A much more detailed Zenmap User\'s Guide is available at
+\fI\%http://insecure.org/nmap/zenmapguide/\fR\. Other documentation and information is available from the Zen web page at
+\fI\%http://insecure.org/nmap/zenmap/\fR\.
 .SH "OPTIONS SUMMARY"
 .PP
 \fB\-f\fR, \fB\-\-file\fR \fIresults file\fR
diff --git a/nmap.h b/nmap.h
index 16d6f133a..8e41b1b6a 100644
--- a/nmap.h
+++ b/nmap.h
@@ -253,8 +253,8 @@ void *realloc();
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
-#define NMAP_VERSION "4.51BETA"
-#define NMAP_NUM_VERSION "4.51.0.0"
+#define NMAP_VERSION "4.52"
+#define NMAP_NUM_VERSION "4.52.0.0"
 #endif
 
 /* User configurable #defines: */