diff --git a/docs/nmap.1 b/docs/nmap.1
index 336647ecc..b6cb50301 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/25/2011
+.\"      Date: 08/24/2011
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "07/25/2011" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "08/24/2011" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -126,7 +126,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 5\&.59BETA1 ( http://nmap\&.org )
+Nmap 5\&.59BETA3 ( http://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\&.
@@ -175,6 +175,9 @@ SCRIPT SCAN:
   \-\-script\-args=<n1=v1,[n2=v2,\&.\&.\&.]>: provide arguments to scripts
   \-\-script\-trace: Show all data sent and received
   \-\-script\-updatedb: Update the script database\&.
+  \-\-script\-help=<Lua scripts>: Show help about scripts\&.
+           <Lua scripts> is a comma separted list of script\-files or
+           script\-categories\&.
 OS DETECTION:
   \-O: Enable OS detection
   \-\-osscan\-limit: Limit OS detection to promising targets
@@ -336,16 +339,17 @@ Because host discovery needs are so diverse, Nmap offers a wide variety of optio
 ping
 tool\&. Users can skip the ping step entirely with a list scan (\fB\-sL\fR) or by disabling ping (\fB\-Pn\fR), or engage the network with arbitrary combinations of multi\-port TCP SYN/ACK, UDP, SCTP INIT and ICMP probes\&. The goal of these probes is to solicit responses which demonstrate that an IP address is actually active (is being used by a host or network device)\&. On many networks, only a small percentage of IP addresses are active at any given time\&. This is particularly common with private address space such as 10\&.0\&.0\&.0/8\&. That network has 16 million IPs, but I have seen it used by companies with less than a thousand machines\&. Host discovery can find those machines in a sparsely allocated sea of IP addresses\&.
 .PP
-If no host discovery options are given, Nmap sends an ICMP echo request, a TCP SYN packet to port 443, a TCP ACK packet to port 80, and an ICMP timestamp request\&. These defaults are equivalent to the
+If no host discovery options are given, Nmap sends an ICMP echo request, a TCP SYN packet to port 443, a TCP ACK packet to port 80, and an ICMP timestamp request\&. (For IPv6, the ICMP timestamp request is omitted because it is not part of ICMPv6\&.) These defaults are equivalent to the
 \fB\-PE \-PS443 \-PA80 \-PP\fR
-options\&. An exception to this is that an ARP scan is used for any targets which are on a local ethernet network\&. For unprivileged Unix shell users, the default probes are a SYN packet to ports 80 and 443 using the
+options\&. The exceptions to this are the ARP (for IPv4) and Neighbor Discovery.\" Neighbor Discovery: for host discovery
+(for IPv6) scans which are used for any targets on a local ethernet network\&. For unprivileged Unix shell users, the default probes are a SYN packet to ports 80 and 443 using the
 \fBconnect\fR
 system call\&..\" unprivileged users: limitations of
 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
-options (which select ping types) can be combined\&. You can increase your odds of penetrating strict firewalls by sending many probe types using different TCP ports/flags and ICMP codes\&. Also note that ARP discovery (\fB\-PR\fR).\" -PR
+options (which select ping types) can be combined\&. You can increase your odds of penetrating strict firewalls by sending many probe types using different TCP ports/flags and ICMP codes\&. Also note that ARP/Neighbor Discovery (\fB\-PR\fR).\" -PR
 is done by default against targets on a local ethernet network even if you specify other
 \fB\-P*\fR
 options, because it is almost always faster and more effective\&.
@@ -572,6 +576,10 @@ ARP scan puts Nmap and its optimized algorithms in charge of ARP requests\&. And
 or
 \fB\-PS\fR) are specified, Nmap uses ARP instead for any of the targets which are on the same LAN\&. If you absolutely don\*(Aqt want to do an ARP scan, specify
 \fB\-\-send\-ip\fR\&.
+.sp
+For IPv6 (\-6 option),
+\fB\-PR\fR
+uses ICMPv6 Neighbor Discovery instead of ARP\&. Neighbor Discovery, defined in RFC 4861, can be seen as the IPv6 equivalent of ARP\&.
 .RE
 .PP
 \fB\-\-traceroute\fR (Trace path to host) .\" --traceroute .\" traceroute
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 7009e3c08..f665a656e 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 5.59BETA1 ( http://nmap.org )
+Nmap 5.59BETA3 ( http://nmap.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
@@ -47,6 +47,9 @@ SCRIPT SCAN:
   --script-args=<n1=v1,[n2=v2,...]>: provide arguments to scripts
   --script-trace: Show all data sent and received
   --script-updatedb: Update the script database.
+  --script-help=<Lua scripts>: Show help about scripts.
+           <Lua scripts> is a comma separted list of script-files or
+           script-categories.
 OS DETECTION:
   -O: Enable OS detection
   --osscan-limit: Limit OS detection to promising targets
diff --git a/docs/zenmap.1 b/docs/zenmap.1
index e975312f5..d9245cbd6 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -2,12 +2,12 @@
 .\"     Title: zenmap
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/30/2011
+.\"      Date: 08/24/2011
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "06/30/2011" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "08/24/2011" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index d07fb7642..662c0b6c4 100644
--- a/ndiff/docs/ndiff.1
+++ b/ndiff/docs/ndiff.1
@@ -2,12 +2,12 @@
 .\"     Title: ndiff
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/30/2011
+.\"      Date: 08/24/2011
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "06/30/2011" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "08/24/2011" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index 2a86edc78..a53257ef4 100644
--- a/nmap.h
+++ b/nmap.h
@@ -252,8 +252,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 "5.59BETA1"
-#define NMAP_NUM_VERSION "5.59.0.1"
+#define NMAP_VERSION "5.59BETA3"
+#define NMAP_NUM_VERSION "5.59.0.3"
 #endif
 
 /* User configurable #defines: */