diff --git a/docs/nmap-update.1 b/docs/nmap-update.1
index 5939beff0..a46726350 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.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2015
+.\"      Date: 11/19/2015
 .\"    Manual: nmap-update Reference Guide
 .\"    Source: nmap-update
 .\"  Language: English
 .\"
-.TH "NMAP\-UPDATE" "1" "11/05/2015" "nmap\-update" "nmap\-update Reference Guide"
+.TH "NMAP\-UPDATE" "1" "11/19/2015" "nmap\-update" "nmap\-update Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index 28c338439..ee3bafedd 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.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2015
+.\"      Date: 11/19/2015
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "11/05/2015" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "11/19/2015" "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 6\&.49SVN ( https://nmap\&.org )
+Nmap 7\&.00SVN ( https://nmap\&.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 ea9c56a07..282b503ec 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 6.49SVN ( https://nmap.org )
+Nmap 7.00SVN ( https://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 393fa58bd..38cb67ee1 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.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2015
+.\"      Date: 11/19/2015
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "11/05/2015" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "11/19/2015" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc
index cb639d922..e5853dab8 100644
--- a/mswin32/nmap.rc
+++ b/mswin32/nmap.rc
@@ -13,7 +13,7 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 6,0,49,0
+FILEVERSION 7,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -30,7 +30,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Insecure.Org\0"
             VALUE "FileDescription", "Nmap\0"
-            VALUE "FileVersion", "6.49SVN\0"
+            VALUE "FileVersion", "7.00SVN\0"
             VALUE "InternalName", "Nmap\0"
             VALUE "LegalCopyright", "Copyright (c) Insecure.Com LLC (fyodor@insecure.org)\0"
             VALUE "LegalTrademarks", "NMAP\0"
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index a0807dfb9..c0b8dbd8b 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.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2015
+.\"      Date: 11/19/2015
 .\"    Manual: Ncat Reference Guide
 .\"    Source: Ncat
 .\"  Language: English
 .\"
-.TH "NCAT" "1" "11/05/2015" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "11/19/2015" "Ncat" "Ncat Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@ Among Ncat\*(Aqs vast number of features there is the ability to chain Ncats tog
 .RS 4
 .\}
 .nf
-Ncat 6\&.49SVN ( https://nmap\&.org/ncat )
+Ncat 7\&.00SVN ( https://nmap\&.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,
@@ -85,6 +85,12 @@ Options taking a time assume seconds\&. Append \*(Aqms\*(Aq for milliseconds,
       \-\-proxy <addr[:port]>  Specify address of host to proxy through
       \-\-proxy\-type <type>    Specify proxy type ("http" or "socks4" or "socks5")
       \-\-proxy\-auth <auth>    Authenticate with HTTP or SOCKS proxy server
+      \-\-ssl                  Connect or listen with SSL
+      \-\-ssl\-cert             Specify SSL certificate file (PEM) for listening
+      \-\-ssl\-key              Specify SSL private key (PEM) for listening
+      \-\-ssl\-verify           Verify trust and domain name of certificates
+      \-\-ssl\-trustfile        PEM file containing trusted SSL certificates
+      \-\-ssl\-ciphers          Cipherlist containing SSL ciphers to use
       \-\-version              Display Ncat\*(Aqs version information and exit
 
 See the ncat(1) manpage for full options, descriptions and usage examples
@@ -462,6 +468,11 @@ If this option is passed, Ncat will only receive data and will not try to send a
 If this option is passed, then Ncat will only send data and will ignore anything received\&. This option also causes Ncat to close the network connection and terminate after EOF is received on standard input\&.
 .RE
 .PP
+\fB\-\-no\-shutdown\fR (Do not shutdown into half\-duplex mode) .\" --no-shutdown (Ncat option)
+.RS 4
+If this option is passed, Ncat will not invoke shutdown on a socket aftering seeing EOF on stdin\&. This is provided for backward\-compatibility with OpenBSD netcat, which exhibits this behavior when executed with its \*(Aq\-d\*(Aq option\&.
+.RE
+.PP
 \fB\-t\fR, \fB\-\-telnet\fR (Answer Telnet negotiations) .\" -t (Ncat option)
 .RS 4
 Handle DO/DONT WILL/WONT Telnet negotiations\&. This makes it possible to script Telnet sessions with Ncat\&.
diff --git a/ncat/docs/ncat.usage.txt b/ncat/docs/ncat.usage.txt
index 6c328e9c8..0fd8dacb6 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 6.49SVN ( https://nmap.org/ncat )
+Ncat 7.00SVN ( https://nmap.org/ncat )
 Usage: ncat [options] [hostname] [port]
 
 Options taking a time assume seconds. Append 'ms' for milliseconds,
@@ -40,6 +40,12 @@ Options taking a time assume seconds. Append 'ms' for milliseconds,
       --proxy <addr[:port]>  Specify address of host to proxy through
       --proxy-type <type>    Specify proxy type ("http" or "socks4" or "socks5")
       --proxy-auth <auth>    Authenticate with HTTP or SOCKS proxy server
+      --ssl                  Connect or listen with SSL
+      --ssl-cert             Specify SSL certificate file (PEM) for listening
+      --ssl-key              Specify SSL private key (PEM) for listening
+      --ssl-verify           Verify trust and domain name of certificates
+      --ssl-trustfile        PEM file containing trusted SSL certificates
+      --ssl-ciphers          Cipherlist containing SSL ciphers to use
       --version              Display Ncat's version information and exit
 
 See the ncat(1) manpage for full options, descriptions and usage examples
diff --git a/ncat/ncat.h b/ncat/ncat.h
index 7db64d89d..9c0e0556f 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -145,7 +145,7 @@
 /* Ncat information for output, etc. */
 #define NCAT_NAME "Ncat"
 #define NCAT_URL "https://nmap.org/ncat"
-#define NCAT_VERSION "6.49SVN"
+#define NCAT_VERSION "7.00SVN"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index abc23d90f..c3be0c1b7 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.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2015
+.\"      Date: 11/19/2015
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "11/05/2015" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "11/19/2015" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index c6c99d27f..1e284dde3 100644
--- a/nmap.h
+++ b/nmap.h
@@ -193,8 +193,8 @@
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
-#define NMAP_VERSION "6.49SVN"
-#define NMAP_NUM_VERSION "6.0.49.0"
+#define NMAP_VERSION "7.00SVN"
+#define NMAP_NUM_VERSION "7.0.0.1"
 #endif
 /* The version number of updates retrieved by the nmap-update
    program. It can be different (but should always be the same or
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index 207db0ee8..d2ea8c50e 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.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/05/2015
+.\"      Date: 11/19/2015
 .\"    Manual: Nping Reference Guide
 .\"    Source: Nping
 .\"  Language: English
 .\"
-.TH "NPING" "1" "11/05/2015" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "11/19/2015" "Nping" "Nping Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index f02c3d126..61757d60e 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -339,7 +339,7 @@
 /* General tunable defines  **************************************************/
 #define NPING_NAME "Nping"
 #define NPING_URL "https://nmap.org/nping"
-#define NPING_VERSION "0.6.49SVN"
+#define NPING_VERSION "0.7.00SVN"
 
 
 #define DEFAULT_VERBOSITY VB_0
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 066d5cf3a..243c14e82 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-6.49SVN
+7.00SVN
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 8b602b570..5fc6f3b39 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "6.49SVN"
+VERSION = "7.00SVN"