diff --git a/CHANGELOG b/CHANGELOG
index 767e2e540..e56f5497a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,48 +1,100 @@
-# Nmap Changelog ($Id$); -*-text-*-
+# Nmap Changelog ($Id: CHANGELOG 36805 2017-06-11 20:17:30Z dmiller $); -*-text-*-
+
+Nmap 7.50 [2017-06-13]
+
+o [Windows] Updated the bundled Npcap from 0.78 to 0.91, with several bugfixes
+  for WiFi connectivity problems and stability issues. [Daniel Miller, Yang Luo]
+
+o Integrated all of your service/version detection fingerprints submitted from
+  September to March (855 of them). The signature count went up 2.9% to 11,418.
+  We now detect 1193 protocols from apachemq, bro, and clickhouse to jmon,
+  slmp, and zookeeper. Highlights: http://seclists.org/nmap-dev/2017/q2/140
+
+o [NSE] Added 14 NSE scripts from 12 authors, bringing the total up to 566!
+  They are all listed at https://nmap.org/nsedoc/, and the summaries are below:
+
+  + [GH#743] broadcast-ospf2-discover discovers OSPF 2 routers and neighbors.
+    OSPFv2 authentication is supported. [Emiliano Ticci]
+
+  + [GH#671] cics-info checks IBM TN3270 services for CICS transaction services
+    and extracts useful information. [Soldier of Fortran]
+
+  + [GH#671] cics-user-brute does brute-force enumeration of CICS usernames on
+    IBM TN3270 services. [Soldier of Fortran]
+
+  + [GH#669] http-cookie-flags checks HTTP session cookies for HTTPOnly and
+    Secure flags. [Steve Benson]
+
+  + http-security-headers checks for the HTTP response headers related to
+    security given in OWASP Secure Headers Project, giving a brief description
+    of the header and its configuration value. [Vinamra Bhatia, Ícaro Torres]
+
+  + [GH#740][GH#759] http-vuln-cve2017-5638 checks for the RCE bug in Apache
+    Struts2. [Seth Jackson]
+
+  + [GH#876] http-vuln-cve2017-5689 detects a privilege escalation
+    vulnerability (INTEL-SA-00075) in Intel Active Management Technology (AMT)
+    capable systems. [Andrew Orr]
+
+  + http-vuln-cve2017-1001000 detects a privilege escalation vulnerability in
+    Wordpress 4.7.0 and 4.7.1 (CVE-2017-1001000) [Vinamra Bhatia]
+
+  + [GH#713] impress-remote-discover attempts to pair with the LibreOffice
+    Impress presentation remote service and extract version info.  Pairing is
+    PIN-protected, and the script can optionally brute-force the PIN.  New
+    service probe and match line also added. [Jeremy Hiebert]
+
+  + [GH#854] smb-double-pulsar-backdoor detects the Shadow Brokers-leaked
+    Double Pulsar backdoor in Windows SMB servers. [Andrew Orr]
+
+  + smb-vuln-cve-2017-7494 detects a remote code execution vulnerability
+    affecting Samba versions 3.5.0 and greater with writable shares.
+    [Wong Wai Tuck]
+
+  + smb-vuln-ms17-010 detects a critical remote code execution vulnerability
+    affecting SMBv1 servers in Microsoft Windows systems (ms17-010).  The
+    script also reports patched systems. [Paulino Calderon]
+
+  + [GH#686] tls-ticketbleed checks for the Ticketbleed vulnerability
+    (CVE-2016-9244) in F5 BIG-IP appliances. [Mak Kolybabi]
+
+  + vmware-version queries VMWare SOAP API for version and product information.
+    Submitted in 2011, this was mistakenly turned into a service probe that was
+    unable to elicit any matches. [Aleksey Tyurin]
+
+o [Ncat] A series of changes and fixes based on feedback from the Red Hat community:
+
+  + [GH#157] Ncat will now continue trying to connect to each resolved address
+    for a hostname before declaring the connection refused, allowing it to
+    fallback from IPv6 to IPv4 or to connect to names that use DNS failover.
+    [Jaromir Koncicky, Michal Hlavinka]
+
+  + The --no-shutdown option now also works in connect mode, not only in listen mode.
+
+  + Made -i/--idle-timeout not cause Ncat in server mode to close while
+    waiting for an initial connection. This was also causing -i to interfere
+    with the HTTP proxy server mode. [Carlos Manso, Daniel Miller]
+
+  + [GH#773] Ncat in server mode properly handles TLS renegotiations and other
+    situations where SSL_read returns a non-fatal error. This was causing
+    SSL-over-TCP connections to be dropped. [Daniel Miller]
+
+  + Enable --ssl-ciphers to be used with Ncat in client mode, not only in
+    server (listen) mode. [Daniel Miller]
+
+o [NSE][GH#266][GH#704][GH#238][GH#883] NSE libraries smb and msrpc now use
+  fully qualified paths. SMB scripts now work against all modern versions
+  of Microsoft Windows. [Paulino Calderon]
 
 o [NSE] smb library's share_get_list now properly uses anonymous connections
   first before falling back authenticating as a known user.
 
-o [NSE] New script smb-vuln-cve-2017-7494 detects the "SambaCry"
-  remote code execution vulnerability affecting Samba versions 3.5.0
-  and greater with writable shares. [Wong Wai Tuck]
-
-o [NSE] Removed script http-hsts-verify. http-security-headers includes
-  all the checks earlier implemented by http-hsts-verify. [Vinamra Bhatia]
-
-o [NSE] New script http-security-headers Checks for the HTTP response headers 
-  related to security given in OWASP Secure Headers Project, shows whether they
-  are configured and gives a brief description of the header and its 
-  configuration value. [Vinamra Bhatia]
-
-o [NSE] New script http-vuln-cve2017-1001000 detects a privilege escalation 
-  vulnerability in Wordpress 4.7.0 and 4.7.1 (CVE2017-1001000) [Vinamra Bhatia]
-
-o [NSE] New script smb-vuln-ms17-010 detects a critical remote code execution 
-  vulnerability affecting SMBv1 servers in Microsoft Windows systems (ms17-010).
-  The script also reports patched systems. [Paulino Calderon]
-
-o [NSE][GH#266][GH#704][GH#238][GH#883] NSE libraries smb and msrpc now use 
-  fully qualified paths. SMB scripts now work against all modern versions 
-  of Microsoft Windows. [Paulino Calderon]
-
-o New service probes and matches for Apache HBase and Hadoop MapReduce. 
+o New service probes and matches for Apache HBase and Hadoop MapReduce.
   [Paulino Calderon]
 
-o [NSE][GH#876] New script http-vuln-cve2017-5689 detects a privilege escalation 
-  vulnerability (INTEL-SA-00075) in Intel Active Management Technology (AMT)
-  capable systems. [Andrew Orr]
-
-o Extended Memcached service probe and added match for Apache ZooKeeper. 
+o Extended Memcached service probe and added match for Apache ZooKeeper.
   [Paulino Calderon]
 
-o [NSE] New script vmware-version queries VMWare SOAP API for version and
-  product information. Submitted in 2011, this was mistakenly turned into a
-  service probe that was unable to elicit any matches. [Aleksey Tyurin]
-
-o [Ncat] The --no-shutdown option now also works in connect mode, not only in
-  listen mode.
-
 o [NSE] New script argument "vulns.short" will reduce vulns library script
   output to a single line containing the target name or IP, the vulnerability
   state, and the CVE ID or title of the vulnerability. [Daniel Miller]
@@ -87,9 +139,6 @@ o [NSE][GH#781] There is a new common function, url.get_default_port(),
 o [NSE][GH#833] Function url.parse() now returns the port part as a number,
   not a string. [nnposter]
 
-o [NSE][GH#854] New script smb-double-pulsar-backdoor detects the Shadow
-  Brokers-leaked Double Pulsar backdoor in Windows SMB servers. [Andrew Orr]
-
 o No longer allow ICMP Time Exceeded messages to mark a host as down during
   host discovery. Running traceroute at the same time as Nmap was causing
   interference. [David Fifield]
@@ -97,10 +146,6 @@ o No longer allow ICMP Time Exceeded messages to mark a host as down during
 o [NSE][GH#807] Fixed a JSON library issue that was causing long integers
   to be expressed in the scientific/exponent notation. [nnposter]
 
-o [Ncat] Made -i/--idle-timeout not cause Ncat in server mode to close while
-  waiting for an initial connection. This was also causing -i to interfere with
-  the HTTP proxy server mode. [Carlos Manso, Daniel Miller]
-
 o [NSE] Fixed several potential hangs in NSE scripts that used
   receive_buf(pattern), which will not return if the service continues to send
   data that does not match pattern. A new function in match.lua, pattern_limit,
@@ -111,32 +156,12 @@ o [Nsock] Handle any and all socket connect errors the same: raise as an Nsock
   error instead of fatal. This prevents Nmap and Ncat from quitting with
   "Strange error from connect:" [Daniel Miller]
 
-o [Ncat][GH#773] Ncat in server mode properly handles TLS renegotiations and
-  other situations where SSL_read returns a non-fatal error. This was causing
-  SSL-over-TCP connections to be dropped. [Daniel Miller]
-
-o [Ncat][GH#157] Ncat will now continue trying to connect to each resolved
-  address for a hostname before declaring the connection refused, allowing it
-  to fallback from IPv6 to IPv4 or to connect to names that use DNS failover.
-  [Jaromir Koncicky, Michal Hlavinka]
-
-o [NSE][GH#743] New script broadcast-ospf2-discover discovers OSPF 2 routers
-  and neighbors. OSPFv2 authentication is supported. [Emiliano Ticci]
-
-o [NSE][GH#740][GH#759] New script http-vuln-cve2017-5638 checks for the RCE
-  bug in Apache Struts2. [Seth Jackson]
-
 o [NSE] Added several commands to redis-info to extract listening addresses,
   connected clients, active channels, and cluster nodes. [Vasiliy Kulikov]
 
 o [NSE][GH#679][GH#681] Refreshed script http-robtex-reverse-ip, reflecting
   changes at the source site (www.robtex.com). [aDoN]
 
-o [NSE][GH#713] New script impress-remote-discover attempts to pair with the
-  LibreOffice Impress presentation remote service and extract version info.
-  Pairing is PIN-protected, and the script can optionally brute-force the PIN.
-  New service probe and match line also added. [Jeremy Hiebert]
-
 o [NSE][GH#620][GH#715] Added 8 new http-enum fingerprints for Hadoop
   infrastructure components. [Thomas Debize, Varunram Ganesh]
 
@@ -146,27 +171,12 @@ o [NSE][GH#629] Added two new fingerprints to http-default-accounts
 o [NSE][GH#716] Fix for oracle-tns-version which was sending an invalid TNS
   probe due to a string escaping mixup. [Alexandr Savca]
 
-o [NSE][GH#671] New script cics-user-brute does brute-force enumeration of CICS
-  usernames on IBM TN3270 services. [Soldier of Fortran]
-
-o [NSE][GH#671] New script cics-info checks IBM TN3270 services for CICS
-  transaction services and extracts useful information. [Soldier of Fortran]
-
-o [NSE][GH#669] New script http-cookie-flags checks HTTP session cookies for
-  HTTPOnly and Secure flags. [Steve Benson]
-
 o [NSE][GH#694] ike-version now outputs information about supported attributes
   and unknown vendor ids. Also, a new fingerprint for FortiGate VPNs was
   submitted by Alexis La Goutte. [Daniel Miller]
 
 o [GH#700] Enabled support for TLS SNI on the Windows platform. [nnposter]
 
-o [GH#686] Script tls-ticketbleed checks for the Ticketbleed vulnerability
-  (CVE-2016-9244) in F5 BIG-IP appliances. [Mak Kolybabi]
-
-o [Ncat] Enable --ssl-ciphers to be used with Ncat in client mode, not only in
-  server (listen) mode. [Daniel Miller]
-
 o [GH#649] New service probe and match lines for the JMON and RSE services of
   IBM Explorer for z/OS. [Soldier of Fortran]
 
@@ -190,9 +200,6 @@ o [Zenmap][GH#626] Zenmap now properly handles the -v0 (no output) option,
 o [GH#630] Updated or removed some OpenSSL library calls that were deprecated
   in OpenSSL 1.1. [eroen]
 
-o [NSE] New script http-hsts-verify reports whether or not HTTP Strict
-  Transport Security is configured. [Ícaro Torres]
-
 o [NSE] Script ssh-hostkey now recognizes and reports Ed25519 keys [nnposter]
 
 o [NSE][GH#627] Fixed script hang in several brute scripts due to the "threads"
@@ -1087,13 +1094,13 @@ o [NSE] [GH#106] Added a new NSE module, ls.lua, for accumulating and
   scripts have been converted to use this module. [Pierre Lalet]
 
 o [NSE] bacnet-info.nse and s7-info.nse were added to the version category.
-  [Paulino Calderon] 
+  [Paulino Calderon]
 
 o [NSE] Added 124 new identifiers to bacnet-info.nse vendor database.
-  [Paulino Calderon] 
+  [Paulino Calderon]
 
-o [NSE] Fixed bacnet-info.nse to bind to the service port detected 
-  during scan instead of fixed port. [Paulino Calderon] 
+o [NSE] Fixed bacnet-info.nse to bind to the service port detected
+  during scan instead of fixed port. [Paulino Calderon]
 
 o [NSE] Enhanced reporting of elliptic curve names and strengths in
   ssl-enum-ciphers. The name of the curve is now reported instead of just "ec"
diff --git a/docs/man-xlate/nmap-de.1 b/docs/man-xlate/nmap-de.1
index 9ad8cf10f..76196d7b2 100644
--- a/docs/man-xlate/nmap-de.1
+++ b/docs/man-xlate/nmap-de.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 18.01.2017
+.\"      Date: 13.06.2017
 .\"    Manual: Nmap-Referenz-Handbuch
 .\"    Source: Nmap
 .\"  Language: German
 .\"
-.TH "NMAP" "1" "18.01.2017" "Nmap" "Nmap\-Referenz\-Handbuch"
+.TH "NMAP" "1" "13.06.2017" "Nmap" "Nmap\-Referenz\-Handbuch"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-es.1 b/docs/man-xlate/nmap-es.1
index 6cafe9e73..c11099e95 100644
--- a/docs/man-xlate/nmap-es.1
+++ b/docs/man-xlate/nmap-es.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 18/01/2017
+.\"      Date: 13/06/2017
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Spanish
 .\"
-.TH "NMAP" "1" "18/01/2017" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "13/06/2017" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-fr.1 b/docs/man-xlate/nmap-fr.1
index fd4be65c3..4d3a0b8e4 100644
--- a/docs/man-xlate/nmap-fr.1
+++ b/docs/man-xlate/nmap-fr.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Auteur" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 18/01/2017
+.\"      Date: 13/06/2017
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: French
 .\"
-.TH "NMAP" "1" "18/01/2017" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "13/06/2017" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-hr.1 b/docs/man-xlate/nmap-hr.1
index 5beba0281..012aea3ad 100644
--- a/docs/man-xlate/nmap-hr.1
+++ b/docs/man-xlate/nmap-hr.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/18/2017
+.\"      Date: 06/13/2017
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Croatian
 .\"
-.TH "NMAP" "1" "01/18/2017" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/13/2017" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-hu.1 b/docs/man-xlate/nmap-hu.1
index 90f946bf7..9667197a1 100644
--- a/docs/man-xlate/nmap-hu.1
+++ b/docs/man-xlate/nmap-hu.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 18/01/2017
+.\"      Date: 13/06/2017
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Hungarian
 .\"
-.TH "NMAP" "1" "18/01/2017" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "13/06/2017" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-id.1 b/docs/man-xlate/nmap-id.1
index 8f1d5b779..3b292afbf 100644
--- a/docs/man-xlate/nmap-id.1
+++ b/docs/man-xlate/nmap-id.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Penulis" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/18/2017
+.\"      Date: 06/13/2017
 .\"    Manual: Panduan Referensi Nmap
 .\"    Source: Nmap
 .\"  Language: Indonesian
 .\"
-.TH "NMAP" "1" "01/18/2017" "Nmap" "Panduan Referensi Nmap"
+.TH "NMAP" "1" "06/13/2017" "Nmap" "Panduan Referensi Nmap"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-it.1 b/docs/man-xlate/nmap-it.1
index 23e62cedb..7a5954131 100644
--- a/docs/man-xlate/nmap-it.1
+++ b/docs/man-xlate/nmap-it.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autore" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 18/01/2017
+.\"      Date: 13/06/2017
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Italian
 .\"
-.TH "NMAP" "1" "18/01/2017" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "13/06/2017" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-ja.1 b/docs/man-xlate/nmap-ja.1
index 4ddc52b49..b61058f13 100644
--- a/docs/man-xlate/nmap-ja.1
+++ b/docs/man-xlate/nmap-ja.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 18/01/2017
+.\"      Date: 13/06/2017
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Japanese
 .\"
-.TH "NMAP" "1" "18/01/2017" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "13/06/2017" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/nmap-update.1 b/docs/nmap-update.1
index ba801aef9..993645d59 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: 12/21/2016
+.\"      Date: 06/13/2017
 .\"    Manual: nmap-update Reference Guide
 .\"    Source: nmap-update
 .\"  Language: English
 .\"
-.TH "NMAP\-UPDATE" "1" "12/21/2016" "nmap\-update" "nmap\-update Reference Guide"
+.TH "NMAP\-UPDATE" "1" "06/13/2017" "nmap\-update" "nmap\-update Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index c733ee7dc..9cadb2858 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: 12/21/2016
+.\"      Date: 06/13/2017
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "12/21/2016" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "06/13/2017" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -130,7 +130,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 7\&.40SVN ( https://nmap\&.org )
+Nmap 7\&.50SVN ( 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 4bfed2e9d..22020ac07 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 7.40SVN ( https://nmap.org )
+Nmap 7.50SVN ( 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 ed003f23b..1beba43b2 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: 12/21/2016
+.\"      Date: 06/13/2017
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "12/21/2016" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "06/13/2017" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc
index f6bec1178..fa60b74aa 100644
--- a/mswin32/nmap.rc
+++ b/mswin32/nmap.rc
@@ -13,7 +13,7 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 7,0,40,100
+FILEVERSION 7,0,50,100
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -30,7 +30,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Insecure.Org\0"
             VALUE "FileDescription", "Nmap\0"
-            VALUE "FileVersion", "7.40SVN\0"
+            VALUE "FileVersion", "7.50SVN\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 509d4ff41..926a2da96 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: 12/21/2016
+.\"      Date: 06/13/2017
 .\"    Manual: Ncat Reference Guide
 .\"    Source: Ncat
 .\"  Language: English
 .\"
-.TH "NCAT" "1" "12/21/2016" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "06/13/2017" "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 7\&.40SVN ( https://nmap\&.org/ncat )
+Ncat 7\&.50SVN ( https://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 44c7bfa23..f0a727a4d 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 7.40SVN ( https://nmap.org/ncat )
+Ncat 7.50SVN ( https://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 f7627b6be..5151dd4e9 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -152,7 +152,7 @@
 /* Ncat information for output, etc. */
 #define NCAT_NAME "Ncat"
 #define NCAT_URL "https://nmap.org/ncat"
-#define NCAT_VERSION "7.40SVN"
+#define NCAT_VERSION "7.50SVN"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index c9b7b4b48..55c0a69e0 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: 12/21/2016
+.\"      Date: 06/13/2017
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "12/21/2016" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "06/13/2017" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index 295f34b35..f56d9a523 100644
--- a/nmap.h
+++ b/nmap.h
@@ -190,13 +190,13 @@
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
-#define NMAP_VERSION "7.40SVN"
-#define NMAP_NUM_VERSION "7.0.40.100"
+#define NMAP_VERSION "7.50SVN"
+#define NMAP_NUM_VERSION "7.0.50.100"
 #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 "7.30"
+#define NMAP_UPDATE_CHANNEL "7.40"
 
 #define NMAP_XMLOUTPUTVERSION "1.04"
 
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index b8305a556..6547a7479 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: 12/21/2016
+.\"      Date: 06/13/2017
 .\"    Manual: Nping Reference Guide
 .\"    Source: Nping
 .\"  Language: English
 .\"
-.TH "NPING" "1" "12/21/2016" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "06/13/2017" "Nping" "Nping Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index e30cd1477..067ed1351 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -342,7 +342,7 @@
 /* General tunable defines  **************************************************/
 #define NPING_NAME "Nping"
 #define NPING_URL "https://nmap.org/nping"
-#define NPING_VERSION "0.7.40SVN"
+#define NPING_VERSION "0.7.50SVN"
 
 
 #define DEFAULT_VERBOSITY VB_0
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 0ab3e61a2..363786c11 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-7.40SVN
+7.50SVN
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 1e104e191..0d1d0abff 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "7.40SVN"
+VERSION = "7.50SVN"