diff --git a/docs/nmap-update.1 b/docs/nmap-update.1
index de2a392c2..b9f2f1181 100644
--- a/docs/nmap-update.1
+++ b/docs/nmap-update.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap-update
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 03/08/2012
+.\"      Date: 05/22/2012
 .\"    Manual: nmap-update Reference Guide
 .\"    Source: nmap-update
 .\"  Language: English
 .\"
-.TH "NMAP\-UPDATE" "1" "03/08/2012" "nmap\-update" "nmap\-update Reference Guide"
+.TH "NMAP\-UPDATE" "1" "05/22/2012" "nmap\-update" "nmap\-update Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index 7c2872064..f52d0c2da 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: 03/08/2012
+.\"      Date: 05/22/2012
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "03/08/2012" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "05/22/2012" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -123,7 +123,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 5\&.61TEST5 ( http://nmap\&.org )
+Nmap 6\&.01 ( http://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\&.
@@ -493,7 +493,9 @@ The payload database is described at \m[blue]\fB\%http://nmap.org/book/nmap-payl
 
 The
 \fB\-\-data\-length\fR.\" --data-length
-option sends a fixed\-length random payload for all ports\&.
+option can be used to send a fixed\-length random payload to every port or (if you specify a value of
+0) to disable payloads\&. You can also disable payloads by specifying
+\fB\-\-data\-length 0\fR\&.
 .sp
 The port list takes the same format as with the previously discussed
 \fB\-PS\fR
@@ -732,7 +734,8 @@ option\&. It can be combined with a TCP scan type such as SYN scan (\fB\-sS\fR)
 UDP scan works by sending a UDP packet to every targeted port\&. For some common ports such as 53 and 161, a protocol\-specific payload is sent, but for most ports the packet is empty\&..\" protocol-specific payloads: UDP
 The
 \fB\-\-data\-length\fR
-option can be used to send a fixed\-length random payload to every port\&. If an ICMP port unreachable error (type 3, code 3) is returned, the port is
+option can be used to send a fixed\-length random payload to every port or (if you specify a value of
+0) to disable payloads\&. If an ICMP port unreachable error (type 3, code 3) is returned, the port is
 closed\&. Other ICMP unreachable errors (type 3, codes 1, 2, 9, 10, or 13) mark the port as
 filtered\&. Occasionally, a service will respond with a UDP packet, proving that it is
 open\&. If no response is received after retransmissions, the port is classified as
@@ -1010,9 +1013,9 @@ Nmap needs an
 nmap\-services
 file with frequency information in order to know which ports are the most common\&. If port frequency information isn\*(Aqt available, perhaps because of the use of a custom
 nmap\-services
-file,
+file, Nmap scans all named ports plus ports 1\-1024\&. In that case,
 \fB\-F\fR
-means to scan only ports that are named in the services file (normally Nmap scans all named ports plus ports 1\(en1024)\&.
+means to scan only ports that are named in the services file\&.
 .RE
 .PP
 \fB\-r\fR (Don\*(Aqt randomize ports) .\" -r .\" randomization of ports
@@ -2535,7 +2538,8 @@ unless you are prepared to suffer downtime\&. We acknowledge here that Nmap may
 .PP
 Because of the slight risk of crashes and because a few black hats like to use Nmap for reconnaissance prior to attacking systems, there are administrators who become upset and may complain when their system is scanned\&. Thus, it is often advisable to request permission before doing even a light scan of a network\&.
 .PP
-Nmap should never be installed with special privileges (e\&.g\&. suid root) for security reasons\&..\" setuid, why Nmap shouldn't be
+Nmap should never be installed with special privileges (e\&.g\&. suid root)\&..\" setuid, why Nmap shouldn't be.\" suid
+That would open up a major security vulnerability as other users on the system (or attackers) could use it for privilege escalation\&.
 .SS "Third\-Party Software and Funding Notices"
 .PP
 This product includes software developed by the
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index b285156da..a5b70f822 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 5.61TEST5 ( http://nmap.org )
+Nmap 6.01 ( http://nmap.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 79ad7e1a0..119d1581e 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: 03/08/2012
+.\"      Date: 05/22/2012
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "03/08/2012" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "05/22/2012" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index 60c8069b6..e426b1520 100644
--- a/ncat/docs/ncat.1
+++ b/ncat/docs/ncat.1
@@ -2,12 +2,12 @@
 .\"     Title: Ncat
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 03/08/2012
+.\"      Date: 05/22/2012
 .\"    Manual: Ncat Reference Guide
 .\"    Source: Ncat
 .\"  Language: English
 .\"
-.TH "NCAT" "1" "03/08/2012" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "05/22/2012" "Ncat" "Ncat Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog
 .RS 4
 .\}
 .nf
-Ncat 5\&.61TEST5 ( http://nmap\&.org/ncat )
+Ncat 6\&.01 ( http://nmap\&.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,
diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt
index cebcdab69..708aeb01c 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 5.61TEST5 ( http://nmap.org/ncat )
+Ncat 6.01 ( http://nmap.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds. Append 'ms' for milliseconds,
diff --git a/ncat/ncat.h b/ncat/ncat.h
index 451bf3fbd..573f03140 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -115,7 +115,7 @@
 /* Ncat information for output, etc. */
 #define NCAT_NAME "Ncat"
 #define NCAT_URL "http://nmap.org/ncat"
-#define NCAT_VERSION "5.61TEST5"
+#define NCAT_VERSION "6.01"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index 6417f77db..b1ab6d865 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: 03/08/2012
+.\"      Date: 05/22/2012
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "03/08/2012" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "05/22/2012" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index a1655c33c..01d7719cf 100644
--- a/nmap.h
+++ b/nmap.h
@@ -231,13 +231,13 @@ 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.61TEST5"
-#define NMAP_NUM_VERSION "5.61.0.5"
+#define NMAP_VERSION "6.01"
+#define NMAP_NUM_VERSION "6.0.1.0"
 #endif
 /* The version number of updates retrieved by the nmap-update
    program. It can be different (but should always be the same or
    earlier) than NMAP_VERSION. */
-#define NMAP_UPDATE_CHANNEL "5.61TEST4"
+#define NMAP_UPDATE_CHANNEL "6.00"
 
 #define NMAP_XMLOUTPUTVERSION "1.04"
 
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index e071d6ba9..981d22f82 100644
--- a/nping/docs/nping.1
+++ b/nping/docs/nping.1
@@ -2,12 +2,12 @@
 .\"     Title: nping
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 03/08/2012
+.\"      Date: 05/22/2012
 .\"    Manual: Nping Reference Guide
 .\"    Source: Nping
 .\"  Language: English
 .\"
-.TH "NPING" "1" "03/08/2012" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "05/22/2012" "Nping" "Nping Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index 708a6d97f..56dfce543 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -309,7 +309,7 @@
 /* General tunable defines  **************************************************/
 #define NPING_NAME "Nping"
 #define NPING_URL "http://nmap.org/nping"
-#define NPING_VERSION "0.5.61TEST5"
+#define NPING_VERSION "0.6.01"
 
 
 #define DEFAULT_VERBOSITY VB_0
diff --git a/scripts/script.db b/scripts/script.db
index ccbfeb89d..c09e624a0 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -165,7 +165,7 @@ Entry { filename = "http-robtex-reverse-ip.nse", categories = { "discovery", "ex
 Entry { filename = "http-robtex-shared-ns.nse", categories = { "discovery", "external", "safe", } }
 Entry { filename = "http-title.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "http-trace.nse", categories = { "discovery", "safe", "vuln", } }
-Entry { filename = "http-traceroute.nse", categories = { "discovery", "safe", "default", } }
+Entry { filename = "http-traceroute.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "http-unsafe-output-escaping.nse", categories = { "discovery", "intrusive", } }
 Entry { filename = "http-userdir-enum.nse", categories = { "auth", "intrusive", } }
 Entry { filename = "http-vhosts.nse", categories = { "discovery", "intrusive", } }
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 66c14f587..f36047a7a 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-5.61TEST5
+6.01
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 05f7bd70a..d11eb61ca 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "5.61TEST5"
+VERSION = "6.01"