[Automatic manuf, services and enterprise-numbers update for 2014-06-29]

Change-Id: I47f6863f34690631f4b7b8dcc654f802155794c6
Reviewed-on: https://code.wireshark.org/review/2697
Reviewed-by: Gerald Combs <gerald@wireshark.org>

5 files changed, 254 insertions, 22 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 76ac7000c7..2ea063e120 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1168,7 +1168,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x09d3, "Com One" },
     { 0x09d7, "Novatel Wireless" },
     { 0x09d9, "KRF Tech, Ltd" },
-    { 0x09da, "A4 Tech Co., Ltd" },
+    { 0x09da, "A4Tech Co., Ltd." },
     { 0x09db, "Measurement Computing Corp." },
     { 0x09dc, "Aimex Corp." },
     { 0x09dd, "Fellowes, Inc." },
@@ -2828,6 +2828,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x2632, "TwinMOS" },
     { 0x2650, "Electronics For Imaging, Inc. [hex]" },
     { 0x2659, "Sundtek" },
+    { 0x2676, "Basler AG" },
     { 0x2730, "Citizen" },
     { 0x2735, "DigitalWay" },
     { 0x2770, "NHJ, Ltd" },
@@ -2997,7 +2998,10 @@ static const value_string usb_products_vals[] = {
     { 0x03eb2141, "ICE debugger" },
     { 0x03eb2310, "EVK11xx evaluation board" },
     { 0x03eb2fe4, "ATxmega32A4U DFU bootloader" },
+    { 0x03eb2fe6, "Cactus V6 (DFU)" },
+    { 0x03eb2fea, "Cactus RF60 (DFU)" },
     { 0x03eb2ff0, "atmega32u2 DFU bootloader" },
+    { 0x03eb2ff4, "atmega32u4 DFU bootloader" },
     { 0x03eb2ffa, "at90usb162 DFU bootloader" },
     { 0x03eb2ffb, "at90usb AVR DFU bootloader" },
     { 0x03eb2ffd, "at89c5130/c5131 DFU bootloader" },
@@ -4408,6 +4412,7 @@ static const value_string usb_products_vals[] = {
     { 0x04242524, "USB MultiSwitch Hub" },
     { 0x04242602, "USB 2.0 Hub" },
     { 0x04242640, "USB 2.0 Hub" },
+    { 0x04242660, "Hub" },
     { 0x04244060, "Ultra Fast Media Reader" },
     { 0x04244064, "Ultra Fast Media Reader" },
     { 0x04247500, "LAN7500 Ethernet 10/100/1000 Adapter" },
@@ -4686,7 +4691,7 @@ static const value_string usb_products_vals[] = {
     { 0x04570150, "Super Talent 1GB Flash Drive" },
     { 0x04570151, "Super Flash 1GB / GXT  64MB Flash Drive" },
     { 0x04570162, "SiS162 usb Wireless LAN Adapter" },
-    { 0x04570163, "802.11 Wireless LAN Adapter" },
+    { 0x04570163, "SiS163U 802.11 Wireless LAN Adapter" },
     { 0x04570817, "SiS-184-ASUS-4352.17 touch panel" },
     { 0x04575401, "Wireless Adapter RO80211GS-USB" },
     { 0x04580001, "Mouse" },
@@ -5196,6 +5201,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d0828, "HD Webcam B990" },
     { 0x046d082d, "HD Pro Webcam C920" },
     { 0x046d0830, "QuickClip" },
+    { 0x046d0837, "BCC950 ConferenceCam" },
     { 0x046d0840, "QuickCam Express" },
     { 0x046d0843, "Webcam C930e" },
     { 0x046d0850, "QuickCam Web" },
@@ -5499,6 +5505,7 @@ static const value_string usb_products_vals[] = {
     { 0x046dc52e, "MK260 Wireless Combo Receiver" },
     { 0x046dc52f, "Unifying Receiver" },
     { 0x046dc532, "Unifying Receiver" },
+    { 0x046dc534, "Unifying Receiver" },
     { 0x046dc603, "3Dconnexion Spacemouse Plus XT" },
     { 0x046dc605, "3Dconnexion CADman" },
     { 0x046dc606, "3Dconnexion Spacemouse Classic" },
@@ -5793,6 +5800,7 @@ static const value_string usb_products_vals[] = {
     { 0x0480a006, "External Disk 1.5TB" },
     { 0x0480a007, "External Disk USB 3.0" },
     { 0x0480a009, "Stor.E Basics" },
+    { 0x0480a00d, "STOR.E BASICS 500GB" },
     { 0x0480d010, "External Disk 3TB" },
     { 0x0482000e, "FS-1020D Printer" },
     { 0x0482000f, "FS-1920 Mono Printer" },
@@ -6599,6 +6607,9 @@ static const value_string usb_products_vals[] = {
     { 0x04a93276, "PowerShot SX170 IS" },
     { 0x04a93277, "PowerShot SX510 HS" },
     { 0x04a9327d, "Powershot ELPH 115 IS / IXUS 132" },
+    { 0x04a9327f, "EOS Rebel T5 / EOS 1200D / EOS Kiss X70" },
+    { 0x04a93284, "PowerShot D30" },
+    { 0x04a93286, "PowerShot SX600 HS" },
     { 0x04a93288, "Powershot ELPH 135 / IXUS 145" },
     { 0x04a93289, "PowerShot ELPH 340 HS / IXUS 265 HS" },
     { 0x04a9328a, "PowerShot ELPH 150 IS / IXUS 155" },
@@ -7249,6 +7260,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d80033, "PICkit2" },
     { 0x04d80036, "PICkit Serial Analyzer" },
     { 0x04d800e0, "PIC32 Starter Board" },
+    { 0x04d804cd, "28Cxxx EEPROM Programmer" },
     { 0x04d80a04, "AGP LIN Serial Analyzer" },
     { 0x04d88000, "In-Circuit Debugger" },
     { 0x04d88001, "ICD2 in-circuit debugger" },
@@ -7608,9 +7620,11 @@ static const value_string usb_products_vals[] = {
     { 0x04e85f04, "NEXiO Sync" },
     { 0x04e85f05, "STORY Station 1TB" },
     { 0x04e86032, "G2 Portable hard drive" },
+    { 0x04e86033, "G2 Portable device" },
     { 0x04e86034, "G2 Portable hard drive" },
     { 0x04e860b3, "M2 Portable Hard Drive" },
     { 0x04e860c4, "M2 Portable Hard Drive USB 3.0" },
+    { 0x04e86124, "D3 Station External Hard Drive" },
     { 0x04e861b6, "M3 Portable Hard Drive 1TB" },
     { 0x04e86601, "Mobile Phone" },
     { 0x04e86602, "Galaxy" },
@@ -7979,6 +7993,7 @@ static const value_string usb_products_vals[] = {
     { 0x04f90217, "MFC-8480DN" },
     { 0x04f90223, "DCP-365CN" },
     { 0x04f90248, "DCP-7055 scanner/printer" },
+    { 0x04f902b3, "MFC J4510DW" },
     { 0x04f91000, "Printer" },
     { 0x04f91002, "Printer" },
     { 0x04f92002, "PTUSB Printing" },
@@ -8074,7 +8089,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d0004, "Direct Connect" },
     { 0x050d0012, "F8T012 Bluetooth Adapter" },
     { 0x050d0013, "F8T013 Bluetooth Adapter" },
-    { 0x050d0017, "B8T017 Bluetooth+EDR 2.1" },
+    { 0x050d0017, "B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub" },
     { 0x050d003a, "Universal Media Reader" },
     { 0x050d0050, "F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a]" },
     { 0x050d0081, "F8T001v2 Bluetooth" },
@@ -8120,6 +8135,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d1103, "F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573]" },
     { 0x050d1106, "F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
     { 0x050d1109, "F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]" },
+    { 0x050d110a, "F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU]" },
     { 0x050d11f2, "ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]" },
     { 0x050d1202, "F5U120-PC Parallel Printer Port" },
     { 0x050d1203, "F5U120-PC Serial Port" },
@@ -8133,7 +8149,7 @@ static const value_string usb_products_vals[] = {
     { 0x050d5055, "F5D5055 Gigabit Network Adapter [AX88xxx]" },
     { 0x050d6050, "F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
     { 0x050d6051, "F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]" },
-    { 0x050d615a, "F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
+    { 0x050d615a, "F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323]" },
     { 0x050d7050, "F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]" },
     { 0x050d7051, "F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB]" },
     { 0x050d705a, "F5D7050 Wireless G Adapter v3000 [Ralink RT2571W]" },
@@ -8289,6 +8305,7 @@ static const value_string usb_products_vals[] = {
     { 0x05472750, "EZ-Link (EZLNKUSB.SYS)" },
     { 0x05472810, "Cypress ATAPI Bridge" },
     { 0x05474d90, "AmScope MD1900 camera" },
+    { 0x05477000, "PowerSpec MCE460 Front Panel LED Display" },
     { 0x05477777, "Bluetooth Device" },
     { 0x05479999, "AN2131 uninitialized (?)" },
     { 0x05481005, "EZ Cart II GameBoy Flash Programmer" },
@@ -9933,6 +9950,7 @@ static const value_string usb_products_vals[] = {
     { 0x05f92206, "Datalogic Gryphon GFS4170" },
     { 0x05f92601, "Datalogin Magellan 1000i Barcode Scanner" },
     { 0x05f92602, "Datalogic Magellan 1100i Barcode Scanner" },
+    { 0x05f94204, "Datalogic Gryphon GFS4470 Fixed Scanner" },
     { 0x05f95204, "Datalogic Gryphon GFS4170 (config mode)" },
     { 0x05fa3301, "Keyboard with PS/2 Mouse Port" },
     { 0x05fa3302, "Keyboard" },
@@ -10329,6 +10347,7 @@ static const value_string usb_products_vals[] = {
     { 0x0686401e, "Dimage E323 Camera" },
     { 0x068e00d3, "OEM 3 axis 5 button joystick" },
     { 0x068e00e2, "HFX OEM Joystick" },
+    { 0x068e00f0, "Multi-Function Panel" },
     { 0x068e00f1, "Pro Throttle" },
     { 0x068e00f2, "Flight Sim Pedals" },
     { 0x068e00f3, "Fighterstick" },
@@ -11056,6 +11075,7 @@ static const value_string usb_products_vals[] = {
     { 0x078174d1, "Sansa Clip+ (msc)" },
     { 0x078174e0, "SanDisk Sansa Fuze+" },
     { 0x078174e4, "SanDisk Sansa Clip Zip" },
+    { 0x078174e5, "Sansa Clip Zip" },
     { 0x07818181, "Pen Flash" },
     { 0x07818183, "Hi-Speed Mass Storage Device" },
     { 0x07818185, "SDCZ2 Cruzer Mini Flash Drive (older, thick)" },
@@ -11157,6 +11177,7 @@ static const value_string usb_products_vals[] = {
     { 0x07aa0018, "Wireless LAN USB-11 mini 2" },
     { 0x07aa001a, "ULUSB-11 Key" },
     { 0x07aa001c, "CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]" },
+    { 0x07aa0020, "CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]" },
     { 0x07aa002e, "CG-WLUSB2GPX [Ralink RT2571W]" },
     { 0x07aa002f, "CG-WLUSB2GNL" },
     { 0x07aa0031, "CG-WLUSB2GS 802.11bg [Atheros AR5523]" },
@@ -11377,6 +11398,7 @@ static const value_string usb_products_vals[] = {
     { 0x07caa815, "AVerTV DVB-T Volar X (A815)" },
     { 0x07caa827, "AVerTV Hybrid Volar HX (A827)" },
     { 0x07caa867, "AVerTV DVB-T (A867)" },
+    { 0x07cab300, "A300 DVB-T TV receiver" },
     { 0x07cab800, "MR800 FM Radio" },
     { 0x07cae880, "MPEG-2 Capture Device (E880)" },
     { 0x07cae882, "MPEG-2 Capture Device (E882)" },
@@ -11653,6 +11675,7 @@ static const value_string usb_products_vals[] = {
     { 0x083a4505, "SMCWUSB-G 802.11bg" },
     { 0x083a4507, "SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523]" },
     { 0x083a4521, "Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887]" },
+    { 0x083a4531, "T-Com Sinus 154 data II [Intersil ISL3887]" },
     { 0x083a5046, "SpeedStream 10/100 Ethernet [pegasus]" },
     { 0x083a5501, "Wireless Adapter 11g" },
     { 0x083a6500, "Cable Modem" },
@@ -12349,6 +12372,7 @@ static const value_string usb_products_vals[] = {
     { 0x09570407, "33220A Waveform Generator" },
     { 0x09570518, "82357B GPIB Interface" },
     { 0x09570a07, "34411A Multimeter" },
+    { 0x09571507, "33210A Waveform Generator" },
     { 0x09571745, "Test and Measurement Device (IVI)" },
     { 0x09572918, "U2702A oscilloscope" },
     { 0x09592bd0, "Intelligent ISDN (Ver. 3.60.04)" },
@@ -12417,7 +12441,7 @@ static const value_string usb_products_vals[] = {
     { 0x09d3000b, "Bluetooth Adapter class 1 [BlueLight]" },
     { 0x09d70100, "NovAtel FlexPack GPS receiver" },
     { 0x09da0006, "Optical Mouse WOP-35 / Trust 450L Optical Mouse" },
-    { 0x09da000a, "Optical Mouse Opto 510D" },
+    { 0x09da000a, "Optical Mouse Opto 510D / OP-620D" },
     { 0x09da000e, "X-F710F Optical Mouse 3xFire Gaming Mouse" },
     { 0x09da0018, "Trust Human Interface Device" },
     { 0x09da001a, "Wireless Mouse & RXM-15 Receiver" },
@@ -12742,6 +12766,7 @@ static const value_string usb_products_vals[] = {
     { 0x0aad0083, "NRP-Z85" },
     { 0x0aad0095, "NRP-Z86" },
     { 0x0ab10002, "OBID RFID-Reader" },
+    { 0x0ab10004, "OBID classic-pro" },
     { 0x0aba8001, "Tracker 110 Protocol Analyzer" },
     { 0x0aba8002, "Explorer 200 Protocol Analyzer" },
     { 0x0abe0101, "SL1200 DAC" },
@@ -12836,7 +12861,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b051706, "WL-167G v1 802.11g Adapter [Ralink RT2571]" },
     { 0x0b051707, "WL-167G v1 802.11g Adapter [Ralink RT2571]" },
     { 0x0b051708, "Mass Storage Device" },
-    { 0x0b05170b, "Mass Storage Device" },
+    { 0x0b05170b, "Multi card reader" },
     { 0x0b05170c, "WL-159g 802.11bg" },
     { 0x0b05170d, "802.11b/g Wireless Network Adapter" },
     { 0x0b051712, "BT-183 Bluetooth 2.0+EDR adapter" },
@@ -12875,6 +12900,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b0517a0, "Xonar U3 sound card" },
     { 0x0b0517a1, "Eee Note EA800 (mass storage mode)" },
     { 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" },
+    { 0x0b0517c7, "WL-330NUL" },
     { 0x0b0517c9, "USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
     { 0x0b054c80, "Asus TF300 Transformer" },
     { 0x0b054c81, "Asus TF300 Transformer (USB debug mode)" },
@@ -12889,6 +12915,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b054e1f, "Asus TF101 Eeepad Transformer (debug mode)" },
     { 0x0b055410, "MeMO Pad HD 7 (MTP mode)" },
     { 0x0b055412, "MeMO Pad HD 7 (PTP mode)" },
+    { 0x0b05550f, "ASUS fonepad 7" },
     { 0x0b056101, "Cable Modem" },
     { 0x0b05620a, "Remote NDIS Device" },
     { 0x0b05b700, "Broadcom Bluetooth 2.1" },
@@ -12899,6 +12926,7 @@ static const value_string usb_products_vals[] = {
     { 0x0b0c003f, "Todos C400 smartcard controller (Handelsbanken card reader)" },
     { 0x0b0c0050, "Argos Mini II Smart Card Reader (CCID)" },
     { 0x0b0d0000, "CenturyCD" },
+    { 0x0b0e034c, "Jabra UC Voice 750 MS" },
     { 0x0b0e0420, "Jabra SPEAK 510" },
     { 0x0b0e094d, "GN Netcom / Jabra REVO Wireless" },
     { 0x0b0e1022, "Jabra PRO 9450, Type 9400BS (DECT Headset)" },
@@ -17193,6 +17221,7 @@ static const value_string usb_products_vals[] = {
     { 0x26591211, "MediaTV Pro III (US)" },
     { 0x26591212, "MediaTV Pro III MiniPCIe (EU)" },
     { 0x26591213, "MediaTV Pro III MiniPCIe (US)" },
+    { 0x2676ba02, "ace" },
     { 0x2730200f, "CT-S310 Label printer" },
     { 0x27350003, "MPIO HS100" },
     { 0x27351001, "MPIO FY200" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 0931118e2f..8336f3624c 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2014-06-20)
+(last updated 2014-06-27)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -32678,9 +32678,9 @@ Decimal
     Kim Laraqui
       kim&spirea.com
 8181
-  Scholz & Friends Dresden GmbH
+  Commarco GmbH (previous was 'Scholz & Friends Dresden GmbH')
     Matthias Peplow
-      mattip&sfberlin.de
+      matthias.peplow&s-f.com
 8182
   The Boston Bit Co
     Matthew McNeely
@@ -115468,9 +115468,9 @@ Decentralization / Helenic Public Administra
     Richard Rainbow
       richard.rainbow&incontech.co.uk
 28972
-  Keio University, Shonan Fujisawa Campus
-    Takeshi Yamane
-      cns-staff&sfc.keio.ac.jp
+  Keio University
+    Tatsumi HOSOKAWA
+      keio-net&itc.keio.ac.jp
 28973
   LVR InfoKom
     Hans-Joerg Kandt
@@ -157153,8 +157153,8 @@ Decentralization / Helenic Public Administra
     James Kinnaird
       james&jameskinnaird.ca
 39393
-  Global Reach Corporation Limited
-    Chris Spencer
+  Global Reach Technology Limited
+    Dr Chris Spencer
       chris.spencer&globalreach.eu.com
 39394
   Direccion General de Escuela Nacional Preparatoria
@@ -164477,9 +164477,9 @@ Decentralization / Helenic Public Administra
     Wojciech Eliasz
       W.Eliasz&asc-tec.de
 41224
-  CloudVaults, LLC
+  MobileVaults, Inc. (previous was 'CloudVaults, LLC')
     Gyle Iverson
-      Gyle&CloudVaults.com
+      Gyle&MobileVaults.com
 41225
   JSC Volga
     Alexander Kollegaev
@@ -175292,6 +175292,138 @@ Decentralization / Helenic Public Administra
   ID.me, Inc.
     Tom Robison
       tom&id.me
+43928
+  Vantage Communications
+    Kevin Miller
+      kmiller&vantage.com
+43929
+  WellerNET
+    Lucien Weller
+      info&wellernet.ch
+43930
+  Radlink Communications
+    Ben Rampling
+      ben.rampling&radlink.com.au
+43931
+  IFB Institut für Bahntechnik GmbH
+    Benjamin Tietz
+      bt&bahntechnik.de
+43932
+  Bluwireless Technology Limited
+    Doug Turner
+      doug.turner&bluwirelesstechnology.com
+43933
+  Exploros inc.
+    Nadav Hameiri
+      nadav.hameiri&exploros.com
+43934
+  Võrumaa Kutsehariduskeskus
+    Allan Liblik
+      ikt&vkhk.ee
+43935
+  Keen IO
+    Joshua Coats
+      joshua&keen.io
+43936
+  zhong yuan hua dian
+    yong fei wang
+      yfwang&zyhd.com.cn
+43937
+  Tieto Signaling Solutions
+    Sten-Ulrik Eriksson
+      sten-ulrik.eriksson&tieto.com
+43938
+  Memorable Images
+    Tony Flury
+      memorable.images&btinternet.com
+43939
+  invliD
+    Sebastian Brückner
+      mail&invlid.com
+43940
+  WISAG Dienstleistungsholding GmbH
+    Fabian Sauer
+      fabian.sauer&wisag.de
+43941
+  Event Store LLP
+    James Nugent
+      james&geteventstore.com
+43942
+  Luma Pictures
+    Brent Hensarling
+      sys&luma-pictures.com
+43943
+  VOLTRONIC POWER TECHNOLOGY CORP.
+    bluefish wei
+      bluefish_wei&voltronicpower.com.cn
+43944
+  VOLTRONIC POWER TECHNOLOGY CORP.
+    bluefish wei
+      bluefish_wei&voltronicpower.com.cn
+43945
+  Telenia Software srl
+    Roberto Grava
+      rgrava&teleniasoftware.it
+43946
+  Vanilla.no
+    Ole Øyvind Hove
+      oleo&vanilla.no
+43947
+  LichtBlick SE
+    Claus Sprave
+      administration&lichtblick.de
+43948
+  Taiwan Intelligent Home
+    Cing-Yao Chen
+      pichu&tih.tw
+43949
+  Aceyus, Inc.
+    Gerard Lilly
+      gerard.lilly&aceyus.com
+43950
+  NexxCom Wireless
+    Michael Overholser
+      michael.overholser&nexxcomwireless.com
+43951
+  Denovo Ventures LLC
+    Geoff Anderson
+      ganderson&denovo-us.com
+43952
+  LRAD Corporation
+    jason wright
+      jasonwright&lradx.com
+43953
+  closerlook, inc.
+    Ronney N Hunter
+      rhunter&closerlook.com
+43954
+  Seno Medical Instruments Inc.
+    Bryan Clingman
+      bclingman&senomedical.com
+43955
+  Radiology Associates LLP
+    Harry Mosser
+      jmosser&xraydocs.com
+43956
+  Total Restyling di Tola Rosa
+    Corrado Mulas
+      amministrazione&totalrestyling.it
+43957
+  Multitone Electronic plc
+    Rupert Johnson
+      rupert.johnson&multitone.com
+43958
+  University of Innsbruck
+    Dirk Draheim
+      dirk.draheim&uibk.ac.at
+43959
+  Torraspapel SA
+    DANIEL ESCORIZA
+      daniel.escoriza&lecta.com
+43960
+  SaF GmbH
+    Thomas Schulte
+      thomas.schulte&saf-kassel.de
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index d98411359f..8796bee6df 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -8201,7 +8201,7 @@ const value_string sminmpec_values[] = {
     {  8178, "Just Innovative Software GmbH" },
     {  8179, "Communications Laboratories Telekommunikations Dienstleistungs-Ges.m.b.H." },
     {  8180, "Spirea" },
-    {  8181, "Scholz & Friends Dresden GmbH" },
+    {  8181, "Commarco GmbH (previous was 'Scholz & Friends Dresden GmbH')" },
     {  8182, "The Boston Bit Co" },
     {  8183, "NetSource America Inc." },
     {  8184, "Inspira S.L." },
@@ -28992,7 +28992,7 @@ const value_string sminmpec_values[] = {
     { 28969, "Dana Koch" },
     { 28970, "Digitec Systems" },
     { 28971, "Incontech Ltd" },
-    { 28972, "Keio University, Shonan Fujisawa Campus" },
+    { 28972, "Keio University" },
     { 28973, "LVR InfoKom" },
     { 28974, "Belarusbank" },
     { 28975, "GSI Europe SL" },
@@ -39413,7 +39413,7 @@ const value_string sminmpec_values[] = {
     { 39390, "Baycom Technology Co.,Ltd" },
     { 39391, "H&L Instruments, LLC" },
     { 39392, "jameskinnaird.ca" },
-    { 39393, "Global Reach Corporation Limited" },
+    { 39393, "Global Reach Technology Limited" },
     { 39394, "Direccion General de Escuela Nacional Preparatoria" },
     { 39395, "ELDIS Pardubice, s.r.o." },
     { 39396, "Zygma LLC" },
@@ -41244,7 +41244,7 @@ const value_string sminmpec_values[] = {
     { 41221, "IMDIT GmbH" },
     { 41222, "Jnsys" },
     { 41223, "ASC-TEC AG" },
-    { 41224, "CloudVaults, LLC" },
+    { 41224, "MobileVaults, Inc. (previous was 'CloudVaults, LLC')" },
     { 41225, "JSC Volga" },
     { 41226, "Ennetix" },
     { 41227, "Voice Conferencing Systems for Misson Control Centers (vocsmcc)" },
@@ -43948,6 +43948,39 @@ const value_string sminmpec_values[] = {
     { 43925, "EastWind" },
     { 43926, "CSI.NET, Inc." },
     { 43927, "ID.me, Inc." },
+    { 43928, "Vantage Communications" },
+    { 43929, "WellerNET" },
+    { 43930, "Radlink Communications" },
+    { 43931, "IFB Institut f\0303\0274r Bahntechnik GmbH" },
+    { 43932, "Bluwireless Technology Limited" },
+    { 43933, "Exploros inc." },
+    { 43934, "V\0303\0265rumaa Kutsehariduskeskus" },
+    { 43935, "Keen IO" },
+    { 43936, "zhong yuan hua dian" },
+    { 43937, "Tieto Signaling Solutions" },
+    { 43938, "Memorable Images" },
+    { 43939, "invliD" },
+    { 43940, "WISAG Dienstleistungsholding GmbH" },
+    { 43941, "Event Store LLP" },
+    { 43942, "Luma Pictures" },
+    { 43943, "VOLTRONIC POWER TECHNOLOGY CORP." },
+    { 43944, "VOLTRONIC POWER TECHNOLOGY CORP." },
+    { 43945, "Telenia Software srl" },
+    { 43946, "Vanilla.no" },
+    { 43947, "LichtBlick SE" },
+    { 43948, "Taiwan Intelligent Home" },
+    { 43949, "Aceyus, Inc." },
+    { 43950, "NexxCom Wireless" },
+    { 43951, "Denovo Ventures LLC" },
+    { 43952, "LRAD Corporation" },
+    { 43953, "closerlook, inc." },
+    { 43954, "Seno Medical Instruments Inc." },
+    { 43955, "Radiology Associates LLP" },
+    { 43956, "Total Restyling di Tola Rosa" },
+    { 43957, "Multitone Electronic plc" },
+    { 43958, "University of Innsbruck" },
+    { 43959, "Torraspapel SA" },
+    { 43960, "SaF GmbH" },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index 6c1804f014..592bd0eca4 100644
--- a/manuf
+++ b/manuf
@@ -17314,6 +17314,7 @@
 08:3F:3E	Wsh                    # WSH GmbH
 08:3F:76	Intellia               # Intellian Technologies, Inc.
 08:40:27	Gridstor               # Gridstore Inc.
+08:46:56	VodalysI               # VODALYS Ingénierie
 08:48:2C	RaycoreT               # Raycore Taiwan Co., LTD.
 08:4E:1C	H2aLlc                 # H2A Systems, LLC
 08:4E:BF	BroadNet               # Broad Net Mux Corporation
@@ -17472,6 +17473,7 @@
 0C:CB:8D	AscoNuma               # ASCO Numatics GmbH
 0C:CD:D3	Eastrive               # EASTRIVER TECHNOLOGY CO., LTD.
 0C:CD:FB	Edic                   # EDIC Systems Inc.
+0C:CF:D1	Springwa               # SPRINGWAVE Co., Ltd
 0C:D2:92	IntelCor               # Intel Corporate
 0C:D2:B5	Binatone               # Binatone Telecommunication Pvt. Ltd
 0C:D5:02	Westell
@@ -17764,6 +17766,7 @@
 18:67:51	KomegInd               # KOMEG Industrielle Messtechnik GmbH
 18:67:B0	SamsungE               # Samsung Electronics Co.,LTD
 18:6D:99	Adanis                 # Adanis Inc.
+18:71:17	EtaPlusE               # eta plus electronic gmbh
 18:79:A2	GmjElect               # GMJ ELECTRIC LIMITED
 18:7A:93	AmiccomE               # AMICCOM Electronics Corporation
 18:7C:81	ValeoVis               # Valeo Vision Systems
@@ -17966,6 +17969,7 @@
 20:5A:00	Coval
 20:5B:2A	Private
 20:5B:5E	Shenzhen               # Shenzhen Wonhe Technology Co., Ltd
+20:5C:FA	Yangzhou               # Yangzhou ChangLian Network Technology Co,ltd.
 20:64:32	SamsungE               # SAMSUNG ELECTRO MECHANICS CO.,LTD.
 20:67:B1	Pluto                  # Pluto inc.
 20:68:9D	LiteonTe               # Liteon Technology Corporation
@@ -18465,6 +18469,7 @@
 34:5C:40	CargtHol               # Cargt Holdings LLC
 34:5D:10	Wytek
 34:61:78	Boeing                 # The Boeing Company
+34:62:88	Cisco
 34:68:4A	Terawork               # Teraworks Co., Ltd.
 34:6B:D3	HuaweiTe               # Huawei Technologies Co., Ltd
 34:6E:8A	Ecosense
@@ -19327,6 +19332,7 @@
 40:D8:55:1E:40:00/36	Stek                   # STEK Ltd
 40:D8:55:50:D0:00/36	Shenzhen               # Shenzhen MaiWei Cable TV Equipment CO.,LTD.
 40:D8:55:EE:60:00/36	Narinet                # Narinet, Inc.
+40:E2:30	Azurewav               # AzureWave Technologies, Inc.
 40:E7:30	DeyStora               # DEY Storage Systems, Inc.
 40:E7:93	Shenzhen               # Shenzhen Siviton Technology Co.,Ltd
 40:EC:F8	Siemens                # Siemens AG
@@ -19401,6 +19407,7 @@
 44:85:00	IntelCor               # Intel Corporate
 44:86:C1	SiemensL               # Siemens Low Voltage & Products
 44:87:FC	Elitegro               # ELITEGROUP COMPUTER SYSTEM CO., LTD.
+44:88:CB	CamcoTec               # Camco Technologies NV
 44:8A:5B	Micro-St               # Micro-Star INT'L CO., LTD.
 44:8C:52	Ktis                   # KTIS CO., Ltd
 44:8E:12	DtResear               # DT Research, Inc.
@@ -19581,6 +19588,7 @@
 4C:72:B9	Pegatron               # Pegatron Corporation
 4C:73:67	GeniusBy               # Genius Bytes Software Solutions GmbH
 4C:73:A5	Kove
+4C:74:03	MundoRea               # Mundo Reader (bq)
 4C:77:4F	Embedded               # Embedded Wireless Labs
 4C:78:97	Arrowhea               # Arrowhead Alarm Products Ltd
 4C:79:BA	IntelCor               # Intel Corporate
@@ -19639,6 +19647,7 @@
 50:0B:32	FoxdaTec               # Foxda Technology Industrial(ShenZhen)Co.,LTD
 50:0E:6D	Trafficc               # TrafficCast International
 50:11:EB	Silverne               # SilverNet Ltd
+50:14:B5	RichfitI               # Richfit Information Technology Co., Ltd
 50:17:FF	Cisco
 50:1A:C5	Microsof               # Microsoft
 50:1C:BF	Cisco
@@ -19647,6 +19656,7 @@
 50:25:2B	NethraIm               # Nethra Imaging Incorporated
 50:26:90	Fujitsu                # Fujitsu Limited
 50:27:C7	Technart               # TECHNART Co.,Ltd
+50:29:4D	NanjingI               # NANJING IOT SENSOR TECHNOLOGY CO,LTD
 50:2A:7E	SmartEle               # Smart electronic GmbH
 50:2A:8B	TelekomR               # Telekom Research and Development Sdn Bhd
 50:2D:1D	Nokia                  # Nokia Corporation
@@ -19838,6 +19848,7 @@
 58:09:43	Private
 58:09:E5	Kivic                  # Kivic Inc.
 58:0A:20	Cisco
+58:10:8C	Intelbra               # Intelbras
 58:12:43	AcsipTec               # AcSiP Technology Corp.
 58:16:26	Avaya                  # Avaya, Inc
 58:17:0C	SonyEric               # Sony Ericsson Mobile Communications AB
@@ -20148,6 +20159,7 @@
 60:FE:C5	Apple
 60:FE:F9	ThomasBe               # Thomas & Betts
 60:FF:DD	CEElectr               # C.E. ELECTRONICS, INC
+64:00:2D	Powerlin               # Powerlinq Co., LTD
 64:00:F1	Cisco                  # CISCO SYSTEMS, INC.
 64:05:BE	NewLight               # NEW LIGHT LED
 64:09:4C	BeijingS               # Beijing Superbee Wireless Technology Co.,Ltd
@@ -20581,18 +20593,22 @@
 70:B3:D5:04:40:00/36	DonElect               # Don Electronics Ltd
 70:B3:D5:05:20:00/36	SudoPrem               # Sudo Premium Engineering
 70:B3:D5:05:80:00/36	TelinkSe               # Telink Semiconductor CO, Limtied, Taiwan
+70:B3:D5:06:20:00/36	RmMichae               # RM Michaelides Software & Elektronik GmbH
 70:B3:D5:07:70:00/36	Inaccess               # InAccess Networks SA
 70:B3:D5:08:E0:00/36	BeijingC               # Beijing CONvision Technology Co.,Ltd
 70:B3:D5:09:00:00/36	Powercra               # POWERCRAFT ELECTRONICS PVT. LTD.
+70:B3:D5:09:10:00/36	EzelinkL               # eZeLink LLC
 70:B3:D5:09:90:00/36	Schwer+K               # Schwer+Kopka GmbH
 70:B3:D5:0A:90:00/36	Proconne               # ProConnections, Inc.
 70:B3:D5:0A:A0:00/36	Wanco                  # Wanco Inc
+70:B3:D5:0A:B0:00/36	KstTechn               # KST technology
 70:B3:D5:0B:30:00/36	ReonixAu               # Reonix Automation
 70:B3:D5:0C:00:00/36	MoluTech               # Molu Technology Inc., LTD.
 70:B3:D5:0D:60:00/36	TattileS               # TATTILE SRL
 70:B3:D5:0E:00:00/36	Plcis
 70:B3:D5:0F:00:00/36	Avionica
 70:B3:D5:0F:B0:00/36	CygnusLl               # Cygnus LLC
+70:B3:D5:0F:F0:00/36	Internet               # INTERNET PROTOCOLO LOGICA SL
 70:B3:D5:10:90:00/36	DitestFa               # DiTEST Fahrzeugdiagnose GmbH
 70:B3:D5:11:20:00/36	DitestFa               # DiTEST Fahrzeugdiagnose GmbH
 70:B3:D5:13:90:00/36	Tunstall               # Tunstall A/S
@@ -20603,6 +20619,7 @@
 70:B3:D5:1A:C0:00/36	SvpBroad               # SVP Broadcast Microwave S.L.
 70:B3:D5:1F:50:00/36	MartecSP               # Martec S.p.A.
 70:B3:D5:20:40:00/36	Twc
+70:B3:D5:20:50:00/36	EsourceS               # Esource Srl
 70:B3:D5:20:C0:00/36	SiemensH               # Siemens Healthcare Diagnostics
 70:B3:D5:22:B0:00/36	Vitec
 70:B3:D5:23:C0:00/36	Quasonix               # Quasonix, LLC
@@ -20647,6 +20664,7 @@
 70:B3:D5:4C:10:00/36	QuercusT               # QUERCUS TECHNOLOGIES, S. L.
 70:B3:D5:4C:80:00/36	Hosokawa               # Hosokawa Micron Powder Systems
 70:B3:D5:50:10:00/36	PeekTraf               # PEEK TRAFFIC
+70:B3:D5:50:20:00/36	Glidewel               # Glidewell Laboratories
 70:B3:D5:50:70:00/36	HumanOri               # Human Oriented Technology, Inc.
 70:B3:D5:51:D0:00/36	TecnintH               # Tecnint HTE Srl
 70:B3:D5:51:E0:00/36	Fundació               # Fundación Cardiovascular de Colombia
@@ -20681,11 +20699,14 @@
 70:B3:D5:70:80:00/36	IbmResea               # IBM Research GmbH
 70:B3:D5:70:90:00/36	Aml
 70:B3:D5:71:00:00/36	Guardian               # Guardian Controls International Ltd
+70:B3:D5:71:E0:00/36	MotecPty               # Motec Pty Ltd
 70:B3:D5:73:10:00/36	Phoniro                # Phoniro Systems AB
 70:B3:D5:75:10:00/36	Gnf
 70:B3:D5:75:50:00/36	Landmark               # LandmarkTech Systems Technology Co.,Ltd.
 70:B3:D5:79:A0:00/36	Innerspe               # Innerspec Technologies Inc.
 70:B3:D5:7A:90:00/36	Adidas                 # adidas AG
+70:B3:D5:7B:30:00/36	Broadsof               # BroadSoft Inc
+70:B3:D5:7D:50:00/36	PowerDra               # Power Dragon Development Limited
 70:B3:D5:7E:70:00/36	Atessa                 # Atessa, Inc.
 70:B3:D5:80:F0:00/36	Quickwar               # Quickware Eng & Des LLC
 70:B3:D5:81:40:00/36	Ingenieu               # Ingenieurbuero SOMTRONIK
@@ -20720,6 +20741,7 @@
 70:B3:D5:A4:00:00/36	StrackLi               # STRACK LIFT AUTOMATION GmbH
 70:B3:D5:A5:70:00/36	Pcsc
 70:B3:D5:A6:20:00/36	Environe               # Environexus
+70:B3:D5:A6:D0:00/36	MetekMet               # Metek Meteorologische Messtechnik GmbH
 70:B3:D5:A7:A0:00/36	FluidMan               # Fluid Management Technology
 70:B3:D5:AA:00:00/36	SimpleWo               # Simple Works, Inc.
 70:B3:D5:AB:70:00/36	Siglead                # SIGLEAD INC
@@ -20761,6 +20783,8 @@
 70:B3:D5:C9:60:00/36	UniDimen               # UNI DIMENXI SDN BHD
 70:B3:D5:CB:70:00/36	Hkc                    # HKC Limited
 70:B3:D5:CB:C0:00/36	ProconEl               # Procon Electronics Pty Ltd
+70:B3:D5:CD:E0:00/36	Multipur               # Multipure International
+70:B3:D5:CE:70:00/36	JuneAuto               # June Automation Singapore Pte. Ltd.
 70:B3:D5:CE:90:00/36	Kinemetr               # KINEMETRICS
 70:B3:D5:CF:10:00/36	Lightdec               # LightDec GmbH & Co. KG
 70:B3:D5:D1:E0:00/36	HoustonR               # Houston Radar LLC
@@ -20783,12 +20807,14 @@
 70:B3:D5:E4:A0:00/36	IcpNewte               # ICP NewTech Ltd
 70:B3:D5:E4:C0:00/36	Iai-Isra               # IAI-Israel Aerospace Industries MBT
 70:B3:D5:E5:30:00/36	Mi                     # MI INC.
+70:B3:D5:E5:80:00/36	ThurlbyT               # Thurlby Thandar Instruments LTD
 70:B3:D5:E7:40:00/36	Exfronti               # Exfrontier Co., Ltd.
 70:B3:D5:E9:20:00/36	FujiData               # FUJI DATA SYSTEM CO.,LTD.
 70:B3:D5:E9:90:00/36	Advitron               # Advitronics telecom bv
 70:B3:D5:E9:A0:00/36	MetaComp               # Meta Computing Services, Corp
 70:B3:D5:EB:00:00/36	NautelLi               # Nautel Limted
 70:B3:D5:EB:20:00/36	ShooterD               # Shooter Detection Systems
+70:B3:D5:EC:10:00/36	XafaxNed               # Xafax Nederland bv
 70:B3:D5:EC:D0:00/36	Sbs-Fein               # SBS-Feintechnik GmbH & Co. KG
 70:B3:D5:EC:F0:00/36	Ipitek
 70:B3:D5:ED:C0:00/36	JDKoftin               # J.D. Koftinoff Software, Ltd.
@@ -20905,6 +20931,7 @@
 74:AE:76	InovoBro               # iNovo Broadband, Inc.
 74:B0:0C	NetworkV               # Network Video Technologies, Inc
 74:B9:EB	FujianJi               # Fujian JinQianMao Electronic Technology Co.,Ltd
+74:BA:DB	Longconn               # Longconn Electornics(shenzhen)Co.,Ltd
 74:BE:08	AtekProd               # ATEK Products, LLC
 74:BF:A1	Hyunteck
 74:C6:21	Zhejiang               # Zhejiang Hite Renewable Energy Co.,LTD
@@ -21142,6 +21169,7 @@
 7C:AC:B2	BoschSof               # Bosch Software Innovations GmbH
 7C:AD:74	Cisco
 7C:B0:3E	Osram                  # OSRAM GmbH
+7C:B1:77	Satelco                # Satelco AG
 7C:B2:1B	CiscoSpv               # Cisco SPVTG
 7C:B2:32	TclKingH               # TCL King High Frequency EI,Co.,LTD
 7C:B5:42	AcesTech               # ACES Technology
@@ -21352,6 +21380,7 @@
 84:84:33	ParadoxE               # Paradox Engineering SA
 84:85:06	Apple
 84:85:0A	HellaSon               # Hella Sonnen- und Wetterschutztechnik GmbH
+84:86:F3	Greenvit               # Greenvity Communications
 84:8D:84	Rajant                 # Rajant Corporation
 84:8D:C7	CiscoSpv               # Cisco SPVTG
 84:8E:0C	Apple
@@ -21383,6 +21412,7 @@
 84:DD:20	TexasIns               # Texas Instruments
 84:DE:3D	CrystalV               # Crystal Vision Ltd
 84:DF:0C	Net2grid               # NET2GRID BV
+84:E0:58	Pace                   # Pace plc
 84:E4:D9	Shenzhen               # Shenzhen NEED technology Ltd.
 84:E6:29	BluwanSa               # Bluwan SA
 84:E7:14	LiangHer               # Liang Herng Enterprise,Co.Ltd.
@@ -21698,6 +21728,7 @@
 90:E2:BA	IntelCor               # Intel Corporate
 90:E6:BA	AsustekC               # ASUSTek COMPUTER INC.
 90:EA:60	SpiLaser               # SPI Lasers Ltd
+90:EF:68	ZyxelCom               # ZyXEL Communications Corporation
 90:F1:AA	SamsungE               # Samsung Electronics Co.,LTD
 90:F1:B0	Hangzhou               # Hangzhou Anheng Info&Tech CO.,LTD
 90:F2:78	RadiusGa               # Radius Gateway
@@ -22073,6 +22104,7 @@ A0:8A:87	HuizhouK               # HuiZhou KaiYue Electronic Co.,Ltd
 A0:8C:15	GerhardD               # Gerhard D. Wempe KG
 A0:8C:9B	XtremeTe               # Xtreme Technologies Corp
 A0:90:DE	VeedimsL               # VEEDIMS,LLC
+A0:93:47	Guangdon               # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD.
 A0:98:05	OpenvoxC               # OpenVox Communication Co Ltd
 A0:98:ED	Shandong               # Shandong Intelligent Optical Communication Development Co., Ltd.
 A0:9A:5A	TimeDoma               # Time Domain
@@ -22162,6 +22194,7 @@ A4:60:32	MrvCommu               # MRV Communications (Networks) LTD
 A4:67:06	Apple
 A4:6C:C1	LtiReene               # LTi REEnergy GmbH
 A4:6E:79	DftSyste               # DFT System Co.Ltd
+A4:70:D6	Motorola               # Motorola Mobility LLC
 A4:77:33	Google
 A4:77:60	Nokia                  # Nokia Corporation
 A4:79:E4	Klinfo                 # KLINFO Corp
@@ -23200,6 +23233,7 @@ CC:22:18	Innodigi               # InnoDigital Co., Ltd.
 CC:26:2D	VerifiLl               # Verifi, LLC
 CC:2A:80	Micro-Bi               # Micro-Biz intelligence solutions Co.,Ltd
 CC:2D:8C	LgElectr               # LG ELECTRONICS INC
+CC:30:80	Vaio                   # VAIO Corporation
 CC:33:BB	Sagemcom               # SAGEMCOM SAS
 CC:34:29	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 CC:34:D7	GewissSP               # GEWISS S.P.A.
@@ -23780,6 +23814,7 @@ E0:A3:0F	Pevco
 E0:A6:70	Nokia                  # Nokia Corporation
 E0:AA:B0	GeneralV               # GENERAL VISION ELECTRONICS CO. LTD.
 E0:AB:FE	OrbNetwo               # Orb Networks, Inc.
+E0:AC:F1	Cisco
 E0:AE:5E	Alps                   # ALPS Co,. Ltd.
 E0:AE:B2	Bender&A               # Bender GmbH & Co.KG
 E0:AE:ED	Loenk
@@ -24041,6 +24076,7 @@ EC:2E:4E	Hitachi-               # HITACHI-LG DATA STORAGE INC
 EC:30:91	Cisco                  # CISCO SYSTEMS, INC.
 EC:35:86	Apple
 EC:3B:F0	Novelsat
+EC:3C:5A	ShenZhen               # SHEN ZHEN HENG SHENG HUI DIGITAL TECHNOLOGY CO.,LTD
 EC:3E:09	Performa               # PERFORMANCE DESIGNED PRODUCTS, LLC
 EC:3F:05	Institut               # Institute 706, The Second Academy China Aerospace Science & Industry Corp
 EC:42:F0	AdlEmbed               # ADL Embedded Solutions, Inc.
@@ -24311,6 +24347,7 @@ F4:E6:D7	SolarPow               # Solar Power Technologies, Inc.
 F4:EA:67	Cisco                  # CISCO SYSTEMS, INC.
 F4:EC:38	Tp-LinkT               # TP-LINK TECHNOLOGIES CO., LTD.
 F4:F1:5A	Apple
+F4:F1:E1	Motorola               # Motorola Mobility LLC
 F4:F2:6D	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 F4:F5:A5	Nokia                  # Nokia corporation
 F4:F5:E8	Google
diff --git a/services b/services
index d9efe0ee42..5ce030c3fd 100644
--- a/services
+++ b/services
@@ -8418,6 +8418,7 @@ tag-pm           5073/udp # Advantage Group Port Mgr [James_Goddard] [James_Godd
 alesquery        5074/tcp # ALES Query [Tim_Maloney] [Tim_Maloney] 2005-08
 alesquery        5074/udp # ALES Query [Tim_Maloney] [Tim_Maloney] 2005-08
 pvaccess         5075/tcp # Experimental Physics and Industrial Control System [Matej_Sekoranja] [Matej_Sekoranja] 2012-03-23
+pixelpusher      5078/udp # PixelPusher pixel data [heroicrobotics.com] [Jasmine_Strong] 2014-06-24
 cp-spxrpts       5079/udp # Cambridge Pixel SPx Reports [Richard_Warren] [Richard_Warren] 2008-09-17
 onscreen         5080/tcp # OnScreen Data Collection Service [Christopher_Miller_2] [Christopher_Miller_2] 2008-01-14
 onscreen         5080/udp # OnScreen Data Collection Service [Christopher_Miller_2] [Christopher_Miller_2] 2008-01-14
@@ -8873,8 +8874,8 @@ auriga-router    5680/udp # Auriga Router Service [Vincent_Gaudeul] [Vincent_Gau
 ncxcp            5681/tcp # Net-coneX Control Protocol [Ryan_Werber] [Ryan_Werber] 2006-06
 ncxcp            5681/udp # Net-coneX Control Protocol [Ryan_Werber] [Ryan_Werber] 2006-06
 brightcore       5682/udp # BrightCore control & data transfer exchange [Marko_Bjelac] [Marko_Bjelac] 2010-06-10
-coap             5683/udp # Constrained Application Protocol [IESG] [IETF_Chair] 2011-06-13 2013-07-25 [RFC-ietf-core-coap-18]
-coaps            5684/udp # DTLS-secured CoAP [IESG] [IETF_Chair] 2013-07-25 [RFC-ietf-core-coap-18]
+coap             5683/udp # Constrained Application Protocol [IESG] [IETF_Chair] 2011-06-13 2013-07-25 [RFC7252]
+coaps            5684/udp # DTLS-secured CoAP [IESG] [IETF_Chair] 2013-07-25 [RFC7252]
 ggz              5688/tcp # GGZ Gaming Zone [Josef_Spillner] [Josef_Spillner] 2003-01
 ggz              5688/udp # GGZ Gaming Zone [Josef_Spillner] [Josef_Spillner] 2003-01
 qmvideo          5689/tcp # QM video network management protocol [Jamie_Lokier] [Jamie_Lokier] 2006-05