diff --git a/CHANGELOG b/CHANGELOG
index 9424bfc02..5d67b9752 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,10 @@ o Included netbios-smb-os-discovery.nse NSE script which uses NetBIOS
 o Compatibility with systems that have the pcre.h header file in its
   own pcre directory should now be fixed for real. [Fyodor]
 
+o Enhanded the radmind service detection signature and added a
+  deprecated radmind port to nmap-services.  Thanks to Matt Selsky for
+  the patch.
+
 4.23RC3
 
 o Zenmap now has a man page!  It isn't very long yet, but covers the
diff --git a/nmap-service-probes b/nmap-service-probes
index 2b0e2c276..361c4c19c 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -1387,7 +1387,7 @@ match quagga m|^\r\nHello, this is [Qq]uagga \(version (\d[-.\w]+)\)\.\r\nCopyri
 
 match qtopia-transfer m|^220 Qtopia transfer service ready!\n| p/Qtopia transfer daemon/ d/PDA/
 
-match radmind m|^200 RAP 1 ([\w-_.]+) ([\w-_.]+) radmind access protocol\r\n| p/radmind/ v/$2/ h/$1/
+match radmind m|^200-?RAP 1 ([\w-_.]+) ([\w-_.]+) radmind access protocol\r\n| p/radmind/ v/$2/ h/$1/
 match rationalsoft m|^\0\0\0\x10ip_infilter=true$| p/Rational Soft Hidden Administrator Server/ o/Windows/ i/ha_server.exe/
 match razor2 m|^sn=\w&srl=\d+&ep4=[-\w]+&a=\w&a=\w+\r\n$| p/Vipul's Razor2 anti-spam service/
 match renderer m|^250 backburner ([\d.]+) Ready\.\r\nbackburner>| p/Discreet Backburner network renderer/ v/$1/
diff --git a/nmap-services b/nmap-services
index 536a087b2..de8814038 100644
--- a/nmap-services
+++ b/nmap-services
@@ -2064,6 +2064,7 @@ montage-lm        6147/tcp   # Montage License Manager
 montage-lm        6147/udp   # Montage License Manager
 ricardo-lm        6148/tcp   # Ricardo North America License Manager
 ricardo-lm        6148/udp   # Ricardo North America License Manager
+radmind           6222/tcp   # Radmind protocol
 gnutella          6346/tcp   # Gnutella file sharing protocol
 gnutella          6346/udp   # Gnutella file sharing protocol
 gnutella2         6347/tcp   # Gnutella2 file sharing protocol
@@ -2080,6 +2081,7 @@ netop-rc          6502/udp   # NetOp Remote Control (by Danware Data A/S)
 xdsxdm            6558/tcp   # 
 xdsxdm            6558/udp   # 
 analogx           6588/tcp   # AnalogX HTTP proxy port
+radmind           6662/tcp   # Radmind protocol (deprecated)
 irc-serv          6666/tcp   # internet relay chat server
 irc               6667/tcp   # Internet Relay Chat
 irc               6668/tcp   # Internet Relay Chat