diff --git a/CHANGELOG b/CHANGELOG
index 0ab0dc5b9..6ebce3159 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,16 @@ o [GH#416] New service probe and match line for iperf3. [Eric Gershman]
 o [NSE][GH#555] Add Drupal to the set of web apps brute forced by
   http-form-brute. [Nima Ghotbi]
 
+Nmap 7.31 [2016-10-20]
+
+o [Windows] Updated the bundled Npcap to 0.10 r9, bringing increased stability,
+  bug fixes, and raw 802.11 WiFi capture (unused by Nmap). [Yang Luo]
+
+o Fixed the way Nmap handles scanning names that resolve to the same IP. Due to
+  changes in 7.30, the IP was only being scanned once, with bogus results
+  displayed for the other names. The previous behavior is now restored.
+  [Tudor Emil Coman]
+
 o [GH#350] Fix an assertion failure due to floating point error in equality
   comparison, which triggered mainly on OpenBSD:
     assertion "diff <= interval" failed: file "timing.cc", line 440
diff --git a/README-WIN32 b/README-WIN32
index a1125cad2..345bc9fcc 100644
--- a/README-WIN32
+++ b/README-WIN32
@@ -1,4 +1,4 @@
-Details on installation, compilation, and limitation of the Nmap
-Security Scanner on the Windows platform is now available in the Nmap
-Installation Guide at https://nmap.org/install/ .
-
+Details on installation, compilation, and limitation of the Nmap
+Security Scanner on the Windows platform is now available in the Nmap
+Installation Guide at https://nmap.org/install/ .
+
diff --git a/docs/nmap-update.1 b/docs/nmap-update.1
index cac752328..4ebe9c039 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: 09/29/2016
+.\"      Date: 10/21/2016
 .\"    Manual: nmap-update Reference Guide
 .\"    Source: nmap-update
 .\"  Language: English
 .\"
-.TH "NMAP\-UPDATE" "1" "09/29/2016" "nmap\-update" "nmap\-update Reference Guide"
+.TH "NMAP\-UPDATE" "1" "10/21/2016" "nmap\-update" "nmap\-update Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/docs/nmap.1 b/docs/nmap.1
index ea34a013b..9447eeb31 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: 09/29/2016
+.\"      Date: 10/21/2016
 .\"    Manual: Nmap Reference Guide
 .\"    Source: Nmap
 .\"  Language: English
 .\"
-.TH "NMAP" "1" "09/29/2016" "Nmap" "Nmap Reference Guide"
+.TH "NMAP" "1" "10/21/2016" "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\&.30SVN ( https://nmap\&.org )
+Nmap 7\&.31SVN ( 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 5f5933482..004058842 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -1,4 +1,4 @@
-Nmap 7.30SVN ( https://nmap.org )
+Nmap 7.31SVN ( 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 d679adf8e..47e51599f 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: 09/29/2016
+.\"      Date: 10/21/2016
 .\"    Manual: Zenmap Reference Guide
 .\"    Source: Zenmap
 .\"  Language: English
 .\"
-.TH "ZENMAP" "1" "09/29/2016" "Zenmap" "Zenmap Reference Guide"
+.TH "ZENMAP" "1" "10/21/2016" "Zenmap" "Zenmap Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/mswin32/nmap.rc b/mswin32/nmap.rc
index 39558e79d..7846cd5c5 100644
--- a/mswin32/nmap.rc
+++ b/mswin32/nmap.rc
@@ -13,7 +13,7 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 7,0,30,100
+FILEVERSION 7,0,31,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.30SVN\0"
+            VALUE "FileVersion", "7.31SVN\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 60e5d138b..c720b99a5 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: 09/29/2016
+.\"      Date: 10/21/2016
 .\"    Manual: Ncat Reference Guide
 .\"    Source: Ncat
 .\"  Language: English
 .\"
-.TH "NCAT" "1" "09/29/2016" "Ncat" "Ncat Reference Guide"
+.TH "NCAT" "1" "10/21/2016" "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\&.30SVN ( https://nmap\&.org/ncat )
+Ncat 7\&.31SVN ( 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 d5cf573ad..24a0589f3 100644
--- a/ncat/docs/ncat.usage.txt
+++ b/ncat/docs/ncat.usage.txt
@@ -1,4 +1,4 @@
-Ncat 7.30SVN ( https://nmap.org/ncat )
+Ncat 7.31SVN ( 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 858e2bbab..3de402e57 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 "7.30SVN"
+#define NCAT_VERSION "7.31SVN"
 
 #ifndef __GNUC__
 #ifndef __attribute__
diff --git a/ndiff/docs/ndiff.1 b/ndiff/docs/ndiff.1
index 93be2daab..e175c6eb5 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: 09/29/2016
+.\"      Date: 10/21/2016
 .\"    Manual: User Commands
 .\"    Source: Ndiff
 .\"  Language: English
 .\"
-.TH "NDIFF" "1" "09/29/2016" "Ndiff" "User Commands"
+.TH "NDIFF" "1" "10/21/2016" "Ndiff" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nmap.h b/nmap.h
index 8a845843f..85a874508 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 "7.30SVN"
-#define NMAP_NUM_VERSION "7.0.30.100"
+#define NMAP_VERSION "7.31SVN"
+#define NMAP_NUM_VERSION "7.0.31.100"
 #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 5882b8d58..c80d1e431 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: 09/29/2016
+.\"      Date: 10/21/2016
 .\"    Manual: Nping Reference Guide
 .\"    Source: Nping
 .\"  Language: English
 .\"
-.TH "NPING" "1" "09/29/2016" "Nping" "Nping Reference Guide"
+.TH "NPING" "1" "10/21/2016" "Nping" "Nping Reference Guide"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/nping/nping.h b/nping/nping.h
index aca9a43ab..46f823d8a 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.7.30SVN"
+#define NPING_VERSION "0.7.31SVN"
 
 
 #define DEFAULT_VERBOSITY VB_0
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/share/zenmap/config/zenmap_version
index a80649845..d3758f7a2 100644
--- a/zenmap/share/zenmap/config/zenmap_version
+++ b/zenmap/share/zenmap/config/zenmap_version
@@ -1 +1 @@
-7.30SVN
+7.31SVN
diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
index 3345358ca..ee3433689 100644
--- a/zenmap/zenmapCore/Version.py
+++ b/zenmap/zenmapCore/Version.py
@@ -1 +1 @@
-VERSION = "7.30SVN"
+VERSION = "7.31SVN"