diff --git a/CHANGELOG b/CHANGELOG
index 6e73d7a33..778700e4b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o New service probe and match line for NoMachine NX Server remote desktop.
+  [Justin Cacak]
+
 o [Zenmap] Fixed a recurring installation problem on OS X/macOS where Zenmap
   was installed to /Applications/Applications/Zenmap.app instead of
   /Applications/Zenmap.app.
diff --git a/nmap-service-probes b/nmap-service-probes
index 4b5b89cfa..39bf8620f 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -15473,3 +15473,12 @@ Probe TCP VersionRequest q|VERSION|
 ports 3310
 rarity 8
 match clam m|^ClamAV ([\w.]+)/(\w+)/(.+)$| p/ClamAV/ v/$1 ($2)/ i/AV definitions updated on:$3/
+
+##############################NEXT PROBE##############################
+# NoMachine Network Server
+# Announce client version 5.6.7 (could be anything)
+Probe TCP NoMachine q|NXSH-5.6.7\n|
+ports 4000
+rarity 9
+
+match nomachine-nx m|^NXD-([\d.]+)\n| p/NoMachine NX Server remote desktop/ v/$1/ cpe:/a:nomachine:nx_server:$1/