diff --git a/docs/nmap.1 b/docs/nmap.1
index 9013efc72..1fc3cc1eb 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -1,12 +1,12 @@
.\" Title: nmap
.\" Author: Gordon \(lqFyodor\(rq Lyon
.\" Generator: DocBook XSL Stylesheets v1.74.0
-.\" Date: 03/30/2009
+.\" Date: 03/31/2009
.\" Manual: Nmap Reference Guide
.\" Source: Nmap First Edition
.\" Language: English
.\"
-.TH "NMAP" "1" "03/30/2009" "Nmap First Edition" "Nmap Reference Guide"
+.TH "NMAP" "1" "03/31/2009" "Nmap First Edition" "Nmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
@@ -277,7 +277,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
.ps -1
.nf
.BB lightgray
-Nmap 4\&.85BETA5 ( http://nmap\&.org )
+Nmap 4\&.85BETA6 ( http://nmap\&.org )
Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc\&.
@@ -2307,7 +2307,7 @@ file which is distributed with Nmap and also available from
.\" copyright
.\" GNU General Public License
.PP
-The Nmap Security Scanner is (C) 1996\(en2008 Insecure\&.Com LLC\&. Nmap is also a registered trademark of Insecure\&.Com LLC\&. This program is free software; you may redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; Version 2 with the clarifications and exceptions described below\&. This guarantees your right to use, modify, and redistribute this software under certain conditions\&. If you wish to embed Nmap technology into proprietary software, we sell alternative licenses (contact
+The Nmap Security Scanner is (C) 1996\(en2009 Insecure\&.Com LLC\&. Nmap is also a registered trademark of Insecure\&.Com LLC\&. This program is free software; you may redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; Version 2 with the clarifications and exceptions described below\&. This guarantees your right to use, modify, and redistribute this software under certain conditions\&. If you wish to embed Nmap technology into proprietary software, we sell alternative licenses (contact
\FCsales@insecure\&.com\F[])\&. Dozens of software vendors already license Nmap technology such as host discovery, port scanning, OS detection, and version detection\&.
.PP
Note that the GPL places important restrictions on
@@ -2375,15 +2375,7 @@ Links to a library or executes a program that does any of the above\&.
.PP
The term
\(lqNmap\(rq
-should be taken to also include any portions or derived works of Nmap\&. This list is not exclusive, but is just meant to clarify our interpretation of derived works with some common examples\&. These restrictions only apply when you actually redistribute Nmap\&. For example, nothing stops you from writing and selling a proprietary front\-end to Nmap\&. Just distribute it by itself, and point people to
-\m[blue]\fB\%http://nmap.org\fR\m[]
-to download Nmap\&.
-.PP
-We don\'t consider these to be added restrictions on top of the GPL, but just a clarification of how we interpret
-\(lqderived works\(rq
-as it applies to our GPL\-licensed Nmap product\&. This is similar to the way Linus Torvalds has announced his interpretation of how
-\(lqderived works\(rq
-applies to Linux kernel modules\&. Our interpretation refers only to Nmap\(emwe don\'t speak for any other GPL products\&.
+should be taken to also include any portions or derived works of Nmap\&. This list is not exclusive, but is meant to clarify our interpretation of derived works with some common examples\&. Our interpretation applies only to Nmap\(emwe don\'t speak for other people\'s GPL works\&.
.PP
If you have any questions about the GPL licensing restrictions on using Nmap in non\-GPL works, we would be happy to help\&. As mentioned above, we also offer alternative license to integrate Nmap into proprietary applications and appliances\&. These contracts have been sold to many security vendors, and generally include a perpetual license as well as providing for priority support and updates as well as helping to fund the continued development of Nmap technology\&. Please email
\FCsales@insecure\&.com\F[]
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 9ade83964..ada2321d0 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 4.85BETA5 ( http://nmap.org )
+Nmap 4.85BETA6 ( 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 391462cbf..2a9170f1b 100644
--- a/docs/zenmap.1
+++ b/docs/zenmap.1
@@ -1,12 +1,12 @@
.\" Title: zenmap
.\" Author: [see the "Authors" section]
.\" Generator: DocBook XSL Stylesheets v1.74.0
-.\" Date: 03/30/2009
+.\" Date: 03/31/2009
.\" Manual: Zenmap Reference Guide
.\" Source: Zenmap
.\" Language: English
.\"
-.TH "ZENMAP" "1" "03/30/2009" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "03/31/2009" "Zenmap" "Zenmap Reference Guide"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
diff --git a/nmap-services b/nmap-services
index c73a903b5..43cdf9f5e 100644
--- a/nmap-services
+++ b/nmap-services
@@ -7,7 +7,7 @@
#
# Derived from IANA data and our own research
#
-# This collection of service data is (C) 1998-2008 by Insecure.Com
+# This collection of service data is (C) 1998-2009 by Insecure.Com
# LLC. It is distributed under the Nmap Open Source license as
# provided in the COPYING file of the source distribution or at
# http://nmap.org/data/COPYING . Note that this license
diff --git a/nmap.h b/nmap.h
index dc09890ce..17466848f 100644
--- a/nmap.h
+++ b/nmap.h
@@ -247,8 +247,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.85BETA5"
-#define NMAP_NUM_VERSION "4.85.0.5"
+#define NMAP_VERSION "4.85BETA6"
+#define NMAP_NUM_VERSION "4.85.0.6"
#endif
/* User configurable #defines: */