diff --git a/CHANGELOG b/CHANGELOG
index 3d1a70bff..db81c13ad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -142,7 +142,7 @@ o [NSE] Loading of a Nikto database failed if the file was referenced
   relative to the Nmap directory [nnposter]
 
 o [GH#2199] Updated Nmap's NPSL license to rewrite a poorly-worded clause
-  abiyt "proprietary software companies".  The new license version 0.93 is
+  about "proprietary software companies".  The new license version 0.93 is
   still available from https://nmap.org/npsl/. As described on that page, we
   are also still offering Nmap 7.90, 7.91, and 7.92 under the previous Nmap
   7.80 license. Finally, we still offer the Nmap OEM program for companies
diff --git a/docs/man-xlate/nmap-de.1 b/docs/man-xlate/nmap-de.1
index 67e9c8327..bc056a468 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 05.10.2020
+.\"      Date: 06.08.2021
 .\"    Manual: Nmap-Referenz-Handbuch
 .\"    Source: Nmap
 .\"  Language: German
 .\"
-.TH "NMAP" "1" "05.10.2020" "Nmap" "Nmap\-Referenz\-Handbuch"
+.TH "NMAP" "1" "06.08.2021" "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 78141bce2..192fc57ed 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 05/10/2020
+.\"      Date: 06/08/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Spanish
 .\"
-.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/08/2021" "[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 3f212290f..345cad890 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 05/10/2020
+.\"      Date: 06/08/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: French
 .\"
-.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/08/2021" "[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 8f0785d78..4cb7d6cba 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Croatian
 .\"
-.TH "NMAP" "1" "10/05/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "08/06/2021" "[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 e3c56d66a..9b69d22b7 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 05/10/2020
+.\"      Date: 06/08/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Hungarian
 .\"
-.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/08/2021" "[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 901adcb86..75c2c508d 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: Panduan Referensi Nmap
 .\"    Source: Nmap
 .\"  Language: Indonesian
 .\"
-.TH "NMAP" "1" "10/05/2020" "Nmap" "Panduan Referensi Nmap"
+.TH "NMAP" "1" "08/06/2021" "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 85cfc4a7f..e58308b8c 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 05/10/2020
+.\"      Date: 06/08/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Italian
 .\"
-.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/08/2021" "[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 16ac457c0..073e1cfd1 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 05/10/2020
+.\"      Date: 06/08/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Japanese
 .\"
-.TH "NMAP" "1" "05/10/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/08/2021" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-pl.1 b/docs/man-xlate/nmap-pl.1
index ccff9ac31..ffd7f64aa 100644
--- a/docs/man-xlate/nmap-pl.1
+++ b/docs/man-xlate/nmap-pl.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Polish
 .\"
-.TH "NMAP" "1" "10/05/2020" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "08/06/2021" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/man-xlate/nmap-pt_BR.1 b/docs/man-xlate/nmap-pt_BR.1
index 1d5454d55..a9e8ed415 100644
--- a/docs/man-xlate/nmap-pt_BR.1
+++ b/docs/man-xlate/nmap-pt_BR.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Autor" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 28/09/2018
+.\"      Date: 06/08/2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Portuguese (Brazil)
 .\"
-.TH "NMAP" "1" "28/09/2018" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06/08/2021" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -173,7 +173,7 @@ TIMING AND PERFORMANCE:
   (seconds), \*(Aqm\*(Aq (minutes), or \*(Aqh\*(Aq (hours) to the value (e\&.g\&. 30m)\&.
   \-T[0\-5]: Set timing template (higher is faster)
   \-\-min\-hostgroup/max\-hostgroup <size>: Parallel host scan group sizes
-  \-\-min\-parallelism/max\-parallelism <time>: Probe parallelization
+  \-\-min\-parallelism/max\-parallelism <numprobes>: Probe parallelization
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <time>: Specifies
       probe round trip time\&.
   \-\-max\-retries <tries>: Caps number of port scan probe retransmissions\&.
diff --git a/docs/man-xlate/nmap-sk.1 b/docs/man-xlate/nmap-sk.1
index b99b26233..15828e87a 100644
--- a/docs/man-xlate/nmap-sk.1
+++ b/docs/man-xlate/nmap-sk.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 28. septembra 2018
+.\"      Date: 06. augusta 2021
 .\"    Manual: [FIXME: manual]
 .\"    Source: [FIXME: source]
 .\"  Language: Slovak
 .\"
-.TH "NMAP" "1" "28. septembra 2018" "[FIXME: source]" "[FIXME: manual]"
+.TH "NMAP" "1" "06. augusta 2021" "[FIXME: source]" "[FIXME: manual]"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -168,7 +168,7 @@ DETEKCIA OS:
 CASOVANIE A VYKON:
   \-T[0\-5]: Nastavit casovaciu sablonu (vyssie cislo zodpoveda rychlejsej sablone)
   \-\-min\-hostgroup/max\-hostgroup <size>: Velkosti skupin paralelnych scanov
-  \-\-min\-parallelism/max\-parallelism <msec>: Paralelizacia testu
+  \-\-min\-parallelism/max\-parallelism <numprobes>: Paralelizacia testu
   \-\-min\-rtt\-timeout/max\-rtt\-timeout/initial\-rtt\-timeout <msec>: Udava
       velkost hodnoty RTT testu 
   \-\-max\-retries <tries>: Udava pocet retransmisii testu scanovania portov\&.
diff --git a/docs/nmap.1 b/docs/nmap.1
index 4bf2a9177..82dabd666 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,12 +2,12 @@
 .\"     Title: nmap
 .\"    Author: [see the "Authors" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "10/05/2020" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "08/06/2021" "Nmap" "Nmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -119,7 +119,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 .RS 4
 .\}
 .nf
-Nmap 7\&.90SVN ( https://nmap\&.org )
+Nmap 7\&.92 ( https://nmap\&.org )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc\&.
@@ -216,6 +216,7 @@ OUTPUT:
   \-\-iflist: Print host interfaces and routes (for debugging)
   \-\-append\-output: Append to rather than clobber specified output files
   \-\-resume <filename>: Resume an aborted scan
+  \-\-noninteractive: Disable runtime interactions via keyboard
   \-\-stylesheet <path/URL>: XSL stylesheet to transform XML output to HTML
   \-\-webxml: Reference stylesheet from Nmap\&.Org for more portable XML
   \-\-no\-stylesheet: Prevent associating of XSL stylesheet w/XML output
@@ -1506,6 +1507,13 @@ time to scan\&. This may be due to poorly performing or unreliable networking ha
 with the maximum amount of time you are willing to wait\&. For example, specify
 30m
 to ensure that Nmap doesn\*(Aqt waste more than half an hour on a single host\&. Note that Nmap may be scanning other hosts at the same time during that half an hour, so it isn\*(Aqt a complete loss\&. A host that times out is skipped\&. No port table, OS detection, or version detection results are printed for that host\&.
+.sp
+The special value
+0
+can be used to mean
+\(lqno timeout\(rq, which can be used to override the
+\fBT5\fR
+timing template, which sets the host timeout to 15 minutes\&.
 .RE
 .PP
 \fB\-\-script\-timeout \fR\fB\fItime\fR\fR
@@ -1513,6 +1521,13 @@ to ensure that Nmap doesn\*(Aqt waste more than half an hour on a single host\&.
 While some scripts complete in fractions of a second, others can take hours or more depending on the nature of the script, arguments passed in, network and application conditions, and more\&. The
 \fB\-\-script\-timeout\fR
 option sets a ceiling on script execution time\&. Any script instance which exceeds that time will be terminated and no output will be shown\&. If debugging (\fB\-d\fR) is enabled, Nmap will report on each timeout\&. For host and service scripts, a script instance only scans a single target host or port and the timeout period will be reset for the next instance\&.
+.sp
+The special value
+0
+can be used to mean
+\(lqno timeout\(rq, which can be used to override the
+\fBT5\fR
+timing template, which sets the script timeout to 10 minutes\&.
 .RE
 .PP
 \fB\-\-scan\-delay \fR\fB\fItime\fR\fR; \fB\-\-max\-scan\-delay \fR\fB\fItime\fR\fR (Adjust delay between probes)
@@ -1606,16 +1621,16 @@ open\&. Since many UDP services do not respond in this way, the chance for inacc
 \fB\-\-defeat\-rst\-ratelimit\fR\&.
 .RE
 .PP
-\fB\-\-nsock\-engine epoll|kqueue|poll|select\fR
+\fB\-\-nsock\-engine iocp|epoll|kqueue|poll|select\fR
 .RS 4
 Enforce use of a given nsock IO multiplexing engine\&. Only the
 select(2)\-based fallback engine is guaranteed to be available on your system\&. Engines are named after the name of the IO management facility they leverage\&. Engines currently implemented are
 epoll,
 kqueue,
 poll, and
-select, but not all will be present on any platform\&. Use
+select, but not all will be present on any platform\&. By default, Nmap will use the "best" engine, i\&.e\&. the first one in this list that is supported\&. Use
 \fBnmap \-V\fR
-to see which engines are supported\&.
+to see which engines are supported on your platform\&.
 .RE
 .PP
 \fB\-T paranoid|sneaky|polite|normal|aggressive|insane\fR (Set a timing template)
@@ -1672,11 +1687,16 @@ is Nmap\*(Aqs default behavior, which includes parallelization\&.
 \fB\-T4\fR
 does the equivalent of
 \fB\-\-max\-rtt\-timeout 1250ms \-\-min\-rtt\-timeout 100ms \-\-initial\-rtt\-timeout 500ms \-\-max\-retries 6\fR
-and sets the maximum TCP scan delay to 10 milliseconds\&.
+and sets the maximum TCP and SCTP scan delay to 10ms\&.
 \fBT5\fR
 does the equivalent of
-\fB\-\-max\-rtt\-timeout 300ms \-\-min\-rtt\-timeout 50ms \-\-initial\-rtt\-timeout 250ms \-\-max\-retries 2 \-\-host\-timeout 15m \-\-script\-timeout 10m\fR
-as well as setting the maximum TCP scan delay to 5\ \&ms\&.
+\fB\-\-max\-rtt\-timeout 300ms \-\-min\-rtt\-timeout 50ms \-\-initial\-rtt\-timeout 250ms \-\-max\-retries 2 \-\-host\-timeout 15m \-\-script\-timeout 10m \-\-max\-scan\-delay\fR
+as well as setting the maximum TCP and SCTP scan delay to 5ms\&. Maximum UDP scan delay is not set by
+\fBT4\fR
+or
+\fBT5\fR, but it can be set with the
+\fB\-\-max\-scan\-delay\fR
+option\&.
 .RE
 .SH "FIREWALL/IDS EVASION AND SPOOFING"
 .PP
@@ -1887,9 +1907,7 @@ Cisco\&. This option only affects raw packet scans such as SYN scan or OS detect
 .PP
 \fB\-\-proxies \fR\fB\fIComma\-separated list of proxy URLs\fR\fR (Relay TCP connections through a chain of proxies)
 .RS 4
-Asks Nmap to establish TCP connections with a final target through supplied chain of one or more HTTP or SOCKS4
-
-proxies\&. Proxies can help hide the true source of a scan or evade certain firewall restrictions, but they can hamper scan performance by increasing latency\&. Users may need to adjust Nmap timeouts and other scan parameters accordingly\&. In particular, a lower
+Asks Nmap to establish TCP connections with a final target through supplied chain of one or more HTTP or SOCKS4 proxies\&. Proxies can help hide the true source of a scan or evade certain firewall restrictions, but they can hamper scan performance by increasing latency\&. Users may need to adjust Nmap timeouts and other scan parameters accordingly\&. In particular, a lower
 \fB\-\-max\-parallelism\fR
 may help because some proxies refuse to handle as many concurrent connections as Nmap opens by default\&.
 .sp
@@ -2192,6 +2210,15 @@ option and pass the output file as its argument\&. No other arguments are permit
 \fBnmap \-\-resume \fR\fB\fIlogfilename\fR\fR\&. Nmap will append new results to the data files specified in the previous execution\&. Scans can be resumed from any of the 3 major output formats: Normal, Grepable, or XML
 .RE
 .PP
+\fB\-\-noninteractive\fR (Disable runtime interactions)
+.RS 4
+At times, such as when running Nmap in a shell background, it might be undesirable for Nmap to monitor and respond to user keyboard input when running\&. (See
+the section called \(lqRUNTIME INTERACTION\(rq
+about how to control Nmap during a scan\&.) Use option
+\fB\-\-noninteractive\fR
+to prevent Nmap taking control of the terminal\&.
+.RE
+.PP
 \fB\-\-stylesheet \fR\fB\fIpath or URL\fR\fR (Set XSL stylesheet to transform XML output)
 .RS 4
 Nmap ships with an XSL
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 512492e0c..db4e0aeeb 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 7.91SVN ( https://nmap.org )
+Nmap 7.92 ( 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 b396b38f9..89b63c488 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "10/05/2020" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "08/06/2021" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/macosx/Makefile b/macosx/Makefile
index 14212c09a..650370e90 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -1,7 +1,7 @@
 # This makefile builds a disk image (.dmg) containing the installer for Nmap,
 # Zenmap, Ncat, and Ndiff.
 
-NMAP_VERSION := $(shell echo NMAP_VERSION | $(CPP) -imacros ../nmap.h - | sed -n '$$s/[" ]//g;$$p')
+export NMAP_VERSION := $(shell echo NMAP_VERSION | $(CPP) -imacros ../nmap.h - | sed -n '$$s/[" ]//g;$$p')
 #OSX_VERSION=$(shell sw_vers -productVersion | cut -d'.' -f1,2 | tr -d ' ')
 OSX_VERSION=10.11
 OSX_MIN_VERSION = 10.9
diff --git a/macosx/check_test.sh b/macosx/check_test.sh
index 8ac2a1cbc..b54740138 100755
--- a/macosx/check_test.sh
+++ b/macosx/check_test.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
 
-export version=$(grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
-export title="nmap-${version}"
+test -n "${NMAP_VERSION}" || exit 1
+export title="nmap-${NMAP_VERSION}"
 export disk="/Volumes/${title}"
 export backgroundPictureName="nmap.png"
 export finalDMGName="${title}.dmg"
diff --git a/macosx/createdmg.sh b/macosx/createdmg.sh
index ee7f4e28b..a90db0713 100755
--- a/macosx/createdmg.sh
+++ b/macosx/createdmg.sh
@@ -1,9 +1,9 @@
 #!/bin/sh -e
 set -x
 
+test -n "${NMAP_VERSION}" || exit 1
 export source=$1
-export version=$(grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' ../nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
-export title="nmap-${version}"
+export title="nmap-${NMAP_VERSION}"
 export size=50000
 export backgroundPictureName="nmap.png"
 export finalDMGName="${title}.dmg"
diff --git a/macosx/openssl.modules b/macosx/openssl.modules
index 3935d7a7c..26000877a 100644
--- a/macosx/openssl.modules
+++ b/macosx/openssl.modules
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd" [
-<!ENTITY nmap_version "7.91SVN">
+<!ENTITY nmap_version "7.92">
 ]>
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
diff --git a/mswin32/Makefile b/mswin32/Makefile
index 1dc48ac63..98553cefe 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -1,4 +1,4 @@
-MAKENSIS=C:/Program Files (x86)/NSIS/makensis.exe
+MAKENSIS=C:/Program Files (x86)/NSIS3-strlen/makensis.exe
 SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%')
 NMAPDIR=..
 NMAPDIR_WIN=$(shell echo '$(NMAPDIR)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g')
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index dbc481e46..10daf9d4f 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -266,6 +266,10 @@ Section "Npcap ${NPCAP_VERSION}" SecNpcap
 SectionEnd
 !endif
 
+Section /o "Check for newer Npcap" SecNewNpcap
+  ExecShell "open" "https://npcap.org/#download"
+SectionEnd
+
 Section "Network Performance Improvements" SecPerfRegistryMods
   SetOutPath "$PLUGINSDIR"
   SetOverwrite on
@@ -440,6 +444,7 @@ FunctionEnd
   LangString DESC_SecCore ${LANG_ENGLISH} "Installs Nmap executable, NSE scripts and Visual C++ ${VCREDISTYEAR} runtime components"
   LangString DESC_SecRegisterPath ${LANG_ENGLISH} "Registers Nmap path to System path so you can execute it from any directory"
   LangString DESC_SecNpcap ${LANG_ENGLISH} "Installs Npcap ${NPCAP_VERSION} (required for most Nmap scans unless it is already installed)"
+  LangString DESC_SecNewNpcap ${LANG_ENGLISH} "Opens npcap.org in your web browser so you can check for a newer version of Npcap."
   LangString DESC_SecPerfRegistryMods ${LANG_ENGLISH} "Modifies Windows registry values to improve TCP connect scan performance.  Recommended."
 !ifndef NMAP_OEM
   LangString DESC_SecZenmap ${LANG_ENGLISH} "Installs Zenmap, the official Nmap graphical user interface.  Recommended."
@@ -452,6 +457,7 @@ FunctionEnd
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} $(DESC_SecCore)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecNpcap} $(DESC_SecNpcap)
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecNewNpcap} $(DESC_SecNewNpcap)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecRegisterPath} $(DESC_SecRegisterPath)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecPerfRegistryMods} $(DESC_SecPerfRegistryMods)
 !ifndef NMAP_OEM
diff --git a/ncat/docs/ncat.1 b/ncat/docs/ncat.1
index 08a75c741..7695fe526 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: Ncat Reference Guide
 .\"    Source: Ncat
 .\"  Language: English
 .\"
-.TH "NCAT" "1" "10/05/2020" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "08/06/2021" "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\&.90SVN ( https://nmap\&.org/ncat )
+Ncat 7\&.92 ( 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 6a60275f6..a702d3970 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 7.91SVN ( https://nmap.org/ncat )
+Ncat 7.92 ( 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 0e7b76680..b603a7eaa 100644
--- a/ncat/ncat.h
+++ b/ncat/ncat.h
@@ -84,7 +84,7 @@
 /* Ncat information for output, etc. */
 #define NCAT_NAME "Ncat"
 #define NCAT_URL "https://nmap.org/ncat"
-#define NCAT_VERSION "7.91SVN"
+#define NCAT_VERSION "7.92"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index 41f1b2249..389b973f0 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "10/05/2020" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "08/06/2021" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index 549dbec0b..c6d86b184 100644
--- a/nmap.h
+++ b/nmap.h
@@ -125,10 +125,10 @@
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
 #define NMAP_MAJOR 7
-#define NMAP_MINOR 91
-#define NMAP_BUILD 1
+#define NMAP_MINOR 92
+#define NMAP_BUILD 0
 /* SVN, BETA, etc. */
-#define NMAP_SPECIAL "SVN"
+#define NMAP_SPECIAL ""
 
 #define NMAP_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) NMAP_SPECIAL
 #define NMAP_NUM_VERSION STR(NMAP_MAJOR) "." STR(NMAP_MINOR) "." STR(NMAP_BUILD) ".0"
diff --git a/nping/configure b/nping/configure
index 2e73b7d78..940996fa7 100755
--- a/nping/configure
+++ b/nping/configure
@@ -2239,10 +2239,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
-
-
 # Check whether --with-localdirs was given.
 if test "${with_localdirs+set}" = set; then :
   withval=$with_localdirs;  case "$with_localdirs" in
diff --git a/nping/docs/nping.1 b/nping/docs/nping.1
index 975f1ab09..7fad71f21 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.79.1 <http://docbook.sf.net/>
-.\"      Date: 10/05/2020
+.\"      Date: 08/06/2021
 .\"    Manual: Nping Reference Guide
 .\"    Source: Nping
 .\"  Language: English
 .\"
-.TH "NPING" "1" "10/05/2020" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "08/06/2021" "Nping" "Nping Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index de4dcea89..437fbb5e9 100644
--- a/nping/nping.h
+++ b/nping/nping.h
@@ -266,7 +266,7 @@
 /* General tunable defines  **************************************************/
 #define NPING_NAME "Nping"
 #define NPING_URL "https://nmap.org/nping"
-#define NPING_VERSION "0.7.91SVN"
+#define NPING_VERSION "0.7.92"
 
 
 #define DEFAULT_VERBOSITY VB_0
diff --git a/scripts/script.db b/scripts/script.db
index b5f117c71..200ee0ac5 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -382,6 +382,7 @@ Entry { filename = "mysql-vuln-cve2012-2122.nse", categories = { "discovery", "i
 Entry { filename = "nat-pmp-info.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "nat-pmp-mapport.nse", categories = { "discovery", "safe", } }
 Entry { filename = "nbd-info.nse", categories = { "discovery", "intrusive", } }
+Entry { filename = "nbns-interfaces.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "nbstat.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "ncp-enum-users.nse", categories = { "auth", "safe", } }
 Entry { filename = "ncp-serverinfo.nse", categories = { "default", "discovery", "safe", } }
@@ -389,7 +390,6 @@ Entry { filename = "ndmp-fs-info.nse", categories = { "discovery", "safe", } }
 Entry { filename = "ndmp-version.nse", categories = { "version", } }
 Entry { filename = "nessus-brute.nse", categories = { "brute", "intrusive", } }
 Entry { filename = "nessus-xmlrpc-brute.nse", categories = { "brute", "intrusive", } }
-Entry { filename = "nbns-interfaces.nse", categories = { "default", "discovery", "safe", } }
 Entry { filename = "netbus-auth-bypass.nse", categories = { "auth", "safe", "vuln", } }
 Entry { filename = "netbus-brute.nse", categories = { "brute", "intrusive", } }
 Entry { filename = "netbus-info.nse", categories = { "default", "discovery", "safe", } }
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index 52ea140f2..ea701a2f5 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-7.91SVN
+7.92
diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py
index 08c78a3ff..f3daf8244 100644
--- a/zenmap/zenmapCore/Name.py
+++ b/zenmap/zenmapCore/Name.py
@@ -67,7 +67,7 @@ APP_DISPLAY_NAME = "Zenmap"
 APP_WEB_SITE = "https://nmap.org/zenmap"
 APP_DOWNLOAD_SITE = "https://nmap.org/download.html"
 APP_DOCUMENTATION_SITE = "https://nmap.org/docs.html"
-APP_COPYRIGHT = "Copyright 2005-2020 Insecure.Com LLC"
+APP_COPYRIGHT = "Copyright 2005-2021 Insecure.Com LLC"
 
 NMAP_DISPLAY_NAME = u"Nmap"
 NMAP_WEB_SITE = "https://nmap.org"
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 5fb681b95..5fc423c62 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "7.91SVN"
+VERSION = "7.92"