diff --git a/CHANGELOG b/CHANGELOG
index 8c3352f51..509e2d576 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -42,6 +42,15 @@ o [GH#1192][Windows] Periodically reset the system idle timer to keep the
   scans and OS detection scans, since NSE and version scan do not rely on
   timing data to adjust speed.
 
+o Update the Nmap Public Source License (NPSL) to Version 0.95. This
+  just clarifies that the derivative works definition and all other
+  license clauses only apply to parties who choose to accept the
+  license in return for the special rights granted (such as Nmap
+  redistribution rights). If a party can do everything they need to
+  using copyright provisions outside of this license such as fair use,
+  we support that and aren't trying to claim any control over their
+  work.
+
 o [GH#1023] Handle Internationalized Domain Names (IDN) like Яндекс.рф on
   platforms where getaddrinfo supports the AI_IDN flag. [Daniel Miller]
 
diff --git a/LICENSE b/LICENSE
index a7fb0aa63..abbcd04e9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Nmap Public Source License Version 0.94
+Nmap Public Source License Version 0.95
 For more information on this license, see https://nmap.org/npsl/
 
 0. Preamble
@@ -139,14 +139,28 @@ if it does any of the following:
   above
 
 * Executes a helper program, module, or script to do any of the above.
-  This list is not exclusive, but is meant to clarify Licensor's
-  intentions with some common examples. Distribution of any works
-  which meet these criteria must be under the terms of this license
-  (including this Main License Body and GPL), with no additional
-  conditions or restrictions. They must abide by all restrictions that
-  the GPL places on derivative or collective works, including the
-  requirements for distributing their source code and allowing
-  royalty-free redistribution.
+
+
+This list is not exclusive, but is meant to clarify Licensor's
+intentions with some common examples. Distribution of any works which
+meet these criteria (and that also choose to accept this license to
+benefit from the rights granted herein) must be under the terms of
+this license (including this Main License Body and GPL), with no
+additional conditions or restrictions. They must abide by all
+restrictions that the GPL places on derivative or collective works,
+including the requirements for distributing their source code and
+allowing royalty-free redistribution. Licensor does not purport to
+control through this license any software which does not require the
+rights granted herein (such as rights to redistribute and/or
+incorporate Covered Software executables and source code). In
+particular, many software packages include the ability to parse
+Covered Software results provided by an end user or to execute Covered
+Software that end user may have already installed on their system. To
+the extent that copyright doctrines such as fair use allow their
+practices without the need to exercise any rights granted by this
+license, vendors and distributors of such software are not bound by
+our definition of derivative works or any other clauses in this
+license.
 
 4. Contributor Agreement (Grant of Copyright and Patent Licenses)