diff --git a/CHANGELOG b/CHANGELOG
index 71d300439..b30710538 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added a SIP (IP phone) probe from Matt Selsky to nmap-service-probes.
+
 o Fixed a bug which prevented the NSE scripts directory from appearing
   in the Win32 .zip version of Nmap.
 
diff --git a/nmap-service-probes b/nmap-service-probes
index d9e41fc64..ed2c3ef54 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -5307,6 +5307,12 @@ match ldap m|^0\x0c\x02\x01\x01a\x07\n\x011\x04\0\x04\0$| p/Cisco LDAP server/
 Probe TCP SIPOptions q|OPTIONS sip:nm SIP/2.0\r\nVia: SIP/2.0/TCP nm;branch=foo\r\nFrom: <sip:nm@nm>;tag=root\r\nTo: <sip:nm2@nm2>\r\nCall-ID: 50000\r\nCSeq: 42 OPTIONS\r\nMax-Forwards: 70\r\nContent-Length: 0\r\nContact: <sip:nm@nm>\r\nAccept: application/sdp\r\n\r\n|
 rarity 5
 ports 5060
+# Some VoIP phones take longer to respond
+totalwaitms 7500
+# OpenSER SIP Server
+match sip m|Server: OpenS[Ee][Rr] \((.*?) \((.*?)\)\)| p/OpenSER SIP Server/ v/$1/ i/$2/
+# Polycom SoundPoint
+match sip m|User-Agent: PolycomSoundPointIP-SPIP_(\d+)-UA/([\d\.]+)| p/Polycom SoundPoint/ v/$1/ i/firmware $2/ d/VoIP phone/
 
 
 ##############################NEXT PROBE##############################