diff --git a/docs/nmap-install.xml b/docs/nmap-install.xml
index 784c9567c..6206f3bdc 100644
--- a/docs/nmap-install.xml
+++ b/docs/nmap-install.xml
@@ -152,7 +152,7 @@ sub 2048g/A50A6A94 2005-04-24
 
 <para>For every Nmap package download file
 (e.g. <filename>nmap-4.76.tar.bz2</filename> and
-<filename>nmap-4.76-win32.zip</filename>), there is a corresponding
+<filename>nmap-4.76-setup.exe</filename>), there is a corresponding
 file in the <filename>sigs</filename> directory with <literal>.asc</literal> appended
 to the name (e.g. <filename>nmap-4.76.tar.bz2.asc</filename>).
 This is the detached signature file.</para>
@@ -748,7 +748,7 @@ Connect scan performance can be
 improved substantially by applying the Registry changes in the
 <filename>nmap_performance.reg</filename> file included with Nmap.  By default these changes are applied for you by the Nmap executable installer.  This registry file
 is in the <filename>nmap-<replaceable>version</replaceable></filename>
-directory of the Windows binary zip file, and
+directory of the Windows binary zip file (for <ulink url="https://nmap.org/oem/">Nmap OEM</ulink> customers), and
 <filename>nmap-<replaceable>version</replaceable>/mswin32</filename>
 in the source tarball (where <replaceable>version</replaceable> is the
 version number of the specific release).  These changes increase
@@ -798,20 +798,17 @@ command-line or through Zenmap.</para>
 <sect2 id="inst-win-zip"><title>Command-line Zip Binaries</title>
 <indexterm><primary>Windows</primary><secondary>zip binaries</secondary></indexterm>
 
-<note><para>Most users prefer installing Nmap with the self-installer discussed previously.</para></note>
+<note><para>The Zip archive is available to <ulink url="https://nmap.org/oem/">Nmap OEM</ulink> customers only. Most users prefer installing Nmap with the self-installer discussed previously.</para></note>
 
-<para>Every stable Nmap release comes with Windows
+<para>Every stable Nmap OEM release is also available as Windows
 command-line binaries and associated files in a Zip archive.  No
 graphical interface is included, so you need to run
-<literal>nmap.exe</literal> from a DOS/command window.  Or you can
-download and install a superior command shell such as those included
-with the free
-Cygwin<indexterm><primary>Cygwin</primary></indexterm>
-system available from <ulink url="https://www.cygwin.com" />.  Here are the step-by-step instructions for installing and executing the Nmap .zip binaries.</para>
+<literal>nmap.exe</literal> from a DOS/command window.
+Here are the step-by-step instructions for installing and executing the Nmap .zip binaries.</para>
 
 <sect3 id="inst-win-zip-install"><title>Installing the Nmap zip binaries</title>
 <orderedlist>
-<listitem><para>Download the .zip binaries from <ulink url="https://nmap.org/download.html" />.</para></listitem>
+<listitem><para>Download the .zip binaries from the link provided in your Nmap OEM order.</para></listitem>
 
 <listitem><para>Extract the zip file into the directory you want
 Nmap to reside in.  An example would be <filename>C:\Program
@@ -825,16 +822,16 @@ changes discussed previously.</para></listitem>
 
 <listitem><para>Nmap requires the free Npcap packet capture library.
 We include a recent Npcap installer which is available in the zip file
-as <filename>npcap-<replaceable>version</replaceable>.exe</filename>,
+as <filename>npcap-<replaceable>version</replaceable>-oem.exe</filename>,
 where <replaceable>version</replaceable> is the Npcap version rather
 than the Nmap version.  Alternatively, you can obtain and install
 the latest version from <ulink url="https://npcap.com" />.
 </para></listitem>
 
 <listitem><para>Due to the way Nmap is compiled, it requires the
-<ulink role="hidepdf" url="https://aka.ms/vs/16/release/vc_redist.x86.exe">Microsoft Visual C++ Redistributable Package</ulink> of runtime
+<ulink role="hidepdf" url="https://aka.ms/vs/17/release/vc_redist.x86.exe">Microsoft Visual C++ Redistributable Package</ulink> of runtime
 components. Many systems already have this installed from other
-packages, but you should run <filename>VC_redist.x86.exe</filename>
+packages, but you should run <filename>vc_redist.x86.exe</filename>
 from the zip file just in case you need it.
 Pass the <option>/q</option> option to run these installers in quiet (non interactive) mode.</para></listitem>
 
@@ -900,11 +897,14 @@ failures.</para></listitem>
 
 <listitem><para>The executable and data files can be found in <filename>nmap-<replaceable>version</replaceable>/mswin32/Release/</filename>.  You can copy them to a preferred directory as long as they are all kept together.</para></listitem>
 
-<listitem><para>Ensure that you have Npcap installed.  You can obtain it by
-installing our binary self-installer or executing
-<filename>npcap-<replaceable>version</replaceable>.exe</filename> from
-our zip package.  Alternatively, you can obtain the official installer at
-<ulink url="https://npcap.com"/>.</para></listitem>
+<listitem><para>Ensure that you have Npcap installed.
+    The official installer for the latest version is available at <ulink
+      url="https://npcap.com/#download"/>. Users who install via
+    our binary self-installer will have Npcap installed automatically.
+    <ulink url="https://nmap.org/oem/">Nmap OEM</ulink> customers can also run
+    <filename>npcap-<replaceable>version</replaceable>.exe</filename> from
+    our zip package.
+</para></listitem>
 
 <listitem><para>Instructions for executing your compiled Nmap are
 given in the next section.</para></listitem>
diff --git a/docs/win32-installer-zenmap-buildguide.txt b/docs/win32-installer-zenmap-buildguide.txt
index cebd5b823..a606024f3 100644
--- a/docs/win32-installer-zenmap-buildguide.txt
+++ b/docs/win32-installer-zenmap-buildguide.txt
@@ -12,7 +12,7 @@ Python-upgrade.txt there for more information.
 
 II. OTHER REQUIREMENTS
 
-You'll need Microsoft Visual C++ 2010 for compilation.
+You'll need Microsoft Visual Studio for compilation.
 Directions for obtaining that are at:
 https://nmap.org/install/inst-windows.html#inst-win-source.
 
@@ -21,9 +21,8 @@ You'll also need Cygwin installed in order to build the Nmap installer
 http://www.cygwin.com/.
 
 And last, you'll need the Nullsoft Scriptable Install System installed.
-You can download if from http://nsis.sourceforge.net/Download  (Version
-2.46 tested). Install in "C:\Program Files\NSIS" even if it offers
-"C:\Program Files (x86)\NSIS".
+You can download if from http://nsis.sourceforge.io/Download  (Version
+3.08 tested).
 
 
 III. BUILDING