diff --git a/CHANGELOG b/CHANGELOG
index 9364c7352..f4e1a5626 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,24 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o [Nping][GH#2862] Promoted Nping version number from a 0.7.95 alpha release to
+  the same release version as Nmap.
+
+o [GH#2982] Fixed an issue preventing the Nmap OEM 7.95 uninstaller from
+  correctly uninstalling Nmap OEM.
+
+o [Zenmap][GH#2854] Fixed a Zenmap crash in DiffViewer when Ndiff exits with error.
+
+o [Zenmap] Fixed several UnicodeDecodeError or UnicodeEncodeError crashes
+  throughout Zenmap.
+
+o [Zenmap][GH#1696] Fixed an issue preventing Zenmap from launching if nmap was
+  not in the PATH. The issue primarily affected macOS users. [Daniel Miller]
+
+o [GH#2838][GH#2836] Fixed a couple of issues with parsing the argument to the
+  -iR option.
+
+o [NSE][GH#2852] Added TLS support to redis.lua and improved -sV detection of redis.
+
 o [Zenmap][GH#2358] Added dark mode, accessed via Profile->Toggle Dark Mode or
   window::dark_mode in zenmap.conf. [Daniel Miller]
 
@@ -32,10 +51,36 @@ o [Nsock][GH#2788] Fix an issue affecting Ncat where unread bytes in the SSL
 o [Ncat][GH#2422] New Ncat option -q to delay quit after EOF on stdin, the
   same as traditional netcat's -q option. [Daniel Miller]
 
+o [Ncat][GH#2843] Ncat in listen mode with -e or -c correctly handles error and
+  EOF conditions that had not been being delivered to the child process.
+
+o [Ncat][Windows] All Nsock engines now work correctly. The default is still
+  'select', but others can be set with --nsock-engine=iocp or
+  --nsock-engine=poll [Daniel Miller]
+
 o [NSE][GH#1014][GH#2616] SSH NSE scripts now catch connection errors thrown by
   the libssh2 Lua binding, providing useful output instead of a backtrace.
   [Joshua Rogers, Daniel Miller]
 
+o [NSE] Several fixes and extensions to the libssh2 NSE bindings: fixed
+  libssh2.channel_read_stderr, which was reading stdout instead; add binding
+  for libssh2_userauth_publickey_frommemory; allow open_channel to avoid allocating a pty;
+
+o [GH#2139][Nsock][Windows] Fixed the IOCP Nsock engine, which had been demoted
+  since Nmap 7.91 due to unresolved issues around SSL sockets and IPv6. [Daniel Miller]
+
+o [Nsock] Improvements for platforms without selectable pcap handles (e.g.
+  Windows). Interleaved pcap and socket events were favoring pcap reads,
+  possibly resulting in timeouts of the socket events. [Daniel Miller]
+
+o [Nsock] Improved memory performance of poll engine on Windows. [Daniel Miller]
+
+o [Nsock][GH#187][GH#2912] Improvements to Nsock event list management, fixing
+  errors like "could not find 1 of the purportedly pending events on that IOD." [Daniel Miller]
+
+o [GH#2113] Fixed the issue where TCP Connect scans (-sT) on Windows would show
+  'filtered' instead of 'closed', due to differences in understanding timeouts.
+
 o Nmap will now allow targets to be specified both on the command line and in
   an input file with -iL. Previously, if targets were provided in both places,
   only the targets in the input file would be scanned, and no notice was given
@@ -49,6 +94,10 @@ o [GH#1451] Nmap now performs forward DNS lookups in parallel, using the same
   took just over an hour. The previous system took 49 hours for the same data
   set! [Daniel Miller]
 
+o When Nmap is used with --disable-arp-ping, a local IP that cannot be
+  ARP-resolved will use the "no-route" reason instead of the "unknown-response"
+  reason, since no response was received.
+
 o [NSE][GH#2571][GH#2572][GH#2622][GH#2784] Various bug fixes in the mssql NSE
   library. [johnjaylward, nnposter]
 
@@ -69,7 +118,7 @@ o [NSE][GH#2901][GH#2744][GH#2745] Arbitrary separator in stdnse.tohex() is now
 o [NSE] ether_type inconsistency in packet.Frame has been resolved. Both
   Frame:new() and Frame:build_ether_frame() now use an integer. [nnposter]
 
-o [GH#2900, GH#2896, GH#2897] Nmap is now able to scan IP protocol 255.
+o [GH#2900][GH#2896][GH#2897] Nmap is now able to scan IP protocol 255.
   [nnposter]
 
 Nmap 7.95 [2024-04-23]