diff --git a/nmap-services b/nmap-services
index 3dc875fe1..be8847f60 100644
--- a/nmap-services
+++ b/nmap-services
@@ -3,7 +3,7 @@
 # Well known service port numbers -*- mode: fundamental; -*-
 # From the Nmap Security Scanner ( http://nmap.org )
 #
-# $Id: nmap-services 9746 2008-08-26 18:45:24Z fyodor $
+# $Id$
 #
 # Derived from IANA data and our own research
 # 
@@ -2628,7 +2628,6 @@ canocentral0	1871/udp	0.000330	# Cano Central 0
 fjmpjps	1873/udp	0.000330	# Fjmpjps
 westell-stats	1875/tcp	0.000152	# westell stats
 westell-stats	1875/udp	0.000330	# westell stats
-mqtt	1883/tcp	0.000330	# Message Queuing Telemetry Transport Protocol
 ibm-mqisdp	1883/udp	0.000330	# IBM MQSeries SCADA
 idmaps	1884/udp	0.000661	# Internet Distance Map Svc
 vrtstrapserver	1885/udp	0.003304	# Veritas Trap Server
@@ -3373,6 +3372,7 @@ unknown	3301/tcp	0.000380
 unknown	3301/udp	0.000991
 opsession-srvr	3304/tcp	0.000152	# OP Session Server
 opsession-srvr	3304/udp	0.000661	# OP Session Server
+odette-ftp	3305/udp	0.000330	# ODETTE-FTP
 mysql	3306/tcp	0.045390	# mySQL
 opsession-prxy	3307/tcp	0.000152	# OP Session Proxy
 dyna-access	3310/tcp	0.000076	# Dyna Access
@@ -4477,8 +4477,6 @@ rrac	5678/tcp	0.000228	# Remote Replication Agent Connection
 activesync	5679/tcp	0.000590	# Microsoft ActiveSync PDY synchronization
 canna	5680/tcp	0.000151	# Canna (Japanese Input)
 brightcore	5682/udp	0.000330	# BrightCore control & data transfer exchange
-coap	5683/udp	0.000330	# Constrained Application Protocol
-coaps	5684/udp	0.000330	# DTLS-secured CoAP
 qmvideo	5689/udp	0.000330	# QM video network management protocol
 unknown	5693/udp	0.000330
 unknown	5699/udp	0.000330
@@ -4869,6 +4867,7 @@ unknown	6606/tcp	0.000076
 unknown	6607/udp	0.000330
 unknown	6610/udp	0.000330
 unknown	6616/udp	0.000330
+odette-ftps	6619/tcp	0.000076	# ODETTE-FTP over TLS/SSL
 unknown	6625/udp	0.000661
 nexgen	6627/udp	0.000661	# Allied Electronics NeXGen
 afesc-mc	6628/tcp	0.000076	# AFE Stock Channel M/C
@@ -5594,7 +5593,6 @@ unknown	8878/tcp	0.000076
 unknown	8879/tcp	0.000076
 cddbp-alt	8880/tcp	0.000076	# CDDBP
 unknown	8882/tcp	0.000076
-secure-mqtt	8883/tcp	0.000076	# Secure MQTT
 unknown	8885/udp	0.000330
 unknown	8886/udp	0.000330
 unknown	8887/tcp	0.000076