[Automatic manuf, services and enterprise-numbers update for 2015-03-15]

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

5 files changed, 350 insertions, 27 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 8c3827e726..3760f5b56a 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -1683,7 +1683,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0da1, "Suzhou Peter's Precise Industrial Co., Ltd" },
     { 0x0da2, "Land Instruments International, Ltd" },
     { 0x0da3, "Nippon Electro-Sensory Devices Corp." },
-    { 0x0da4, "Polar Electro OY" },
+    { 0x0da4, "Polar Electro Oy" },
     { 0x0da7, "IOGear, Inc." },
     { 0x0da8, "softDSP Co., Ltd" },
     { 0x0dab, "Cubig Group" },
@@ -1693,6 +1693,7 @@ static const value_string usb_vendors_vals[] = {
     { 0x0db2, "Shian Hwi Plug Parts, Plastic Factory" },
     { 0x0db3, "Tekram Technology Co., Ltd" },
     { 0x0db4, "Chung Fu Chen Yeh Enterprise Corp." },
+    { 0x0db5, "Access IS" },
     { 0x0db7, "ELCON Systemtechnik" },
     { 0x0dba, "Digidesign" },
     { 0x0dbc, "A&D Medical" },
@@ -3108,6 +3109,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00212, "DeskJet 1220C" },
     { 0x03f00217, "LaserJet 2200" },
     { 0x03f00218, "APOLLO P2500/2600" },
+    { 0x03f0022a, "Laserjet CP1525nw" },
     { 0x03f00241, "Link-5 micro dongle" },
     { 0x03f00304, "DeskJet 810c/812c" },
     { 0x03f00305, "ScanJet 4300c" },
@@ -3380,7 +3382,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f03f02, "PhotoSmart 7550~" },
     { 0x03f03f11, "PSC-1315/PSC-1317" },
     { 0x03f04002, "HP PhotoSmart ..." },
-    { 0x03f04004, "cp1160" },
+    { 0x03f04004, "CP1160" },
     { 0x03f04102, "PhotoSmart 618" },
     { 0x03f04105, "ScanJet 4370" },
     { 0x03f04111, "OfficeJet 7200 series" },
@@ -3640,6 +3642,7 @@ static const value_string usb_products_vals[] = {
     { 0x04030232, "Serial Converter" },
     { 0x04031060, "JTAG adapter" },
     { 0x04031234, "IronLogic RFID Adapter [Z-2 USB]" },
+    { 0x04031235, "Iron Logic Z-397 RS-485/422 converter" },
     { 0x04036001, "FT232 USB-Serial (UART) IC" },
     { 0x04036002, "Lumel PD12" },
     { 0x04036007, "Serial Converter" },
@@ -3664,6 +3667,7 @@ static const value_string usb_products_vals[] = {
     { 0x04038b2a, "Alpermann+Velte Rubidium Q1" },
     { 0x04038b2b, "Alpermann+Velte TCD" },
     { 0x04038b2c, "Alpermann+Velte TCC70" },
+    { 0x04039090, "SNAP Stick 200" },
     { 0x04039132, "LCD and Temperature Interface" },
     { 0x04039133, "CallerID" },
     { 0x04039135, "Rotary Pub alarm" },
@@ -4048,6 +4052,7 @@ static const value_string usb_products_vals[] = {
     { 0x041100db, "External Hard Drive HD-PF32OU2 [Buffalo Ministation]" },
     { 0x041100e8, "WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870]" },
     { 0x04110105, "External Hard Drive HD-CEU2 [Drive Station]" },
+    { 0x0411012c, "SATA Bridge" },
     { 0x0411012e, "WLI-UC-AG300N Wireless LAN Adapter" },
     { 0x04110148, "WLI-UC-G300HP Wireless LAN Adapter" },
     { 0x04110150, "WLP-UC-AG300 Wireless LAN Adapter" },
@@ -4736,6 +4741,8 @@ static const value_string usb_products_vals[] = {
     { 0x04516070, "RNDIS/BeWAN ADSL2+" },
     { 0x0451625f, "TUSB6250 ATA Bridge" },
     { 0x04518042, "Hub" },
+    { 0x04518142, "TUSB8041 4-Port Hub" },
+    { 0x0451926b, "TUSB9260 Boot Loader" },
     { 0x0451dbc0, "Device Bay Controller" },
     { 0x0451e001, "GraphLink [SilverLink]" },
     { 0x0451e003, "TI-84 Plus Calculator" },
@@ -5377,6 +5384,7 @@ static const value_string usb_products_vals[] = {
     { 0x046d0a17, "G330 Headset" },
     { 0x046d0a1f, "G930" },
     { 0x046d0a29, "H600 [Wireless Headset]" },
+    { 0x046d0a37, "USB Headset H540" },
     { 0x046d0a38, "Headset H340" },
     { 0x046d0a44, "Wired headset" },
     { 0x046d0a4d, "G430 Surround Sound Gaming Headset" },
@@ -5458,7 +5466,7 @@ static const value_string usb_products_vals[] = {
     { 0x046dc11f, "Harmony 900/1100 Remote" },
     { 0x046dc121, "Harmony One Remote" },
     { 0x046dc122, "Harmony 650/700 Remote" },
-    { 0x046dc124, "Harmony 300 Remote" },
+    { 0x046dc124, "Harmony 300/350 Remote" },
     { 0x046dc125, "Harmony 200 Remote" },
     { 0x046dc126, "Harmony Link" },
     { 0x046dc129, "Harmony Hub" },
@@ -5747,6 +5755,7 @@ static const value_string usb_products_vals[] = {
     { 0x047120e3, "GoGear Raga" },
     { 0x047120e4, "GoGear ViBE 8GB" },
     { 0x047120e5, "Philips GoGear Vibe/02" },
+    { 0x04712160, "Mio LINK Heart Rate Monitor" },
     { 0x0471262c, "SPC230NC Webcam" },
     { 0x0471485d, "Senselock SenseIV v2.x" },
     { 0x04717e01, "Philips PSA235" },
@@ -5902,6 +5911,7 @@ static const value_string usb_products_vals[] = {
     { 0x04832017, "Biometric Smart Card Reader" },
     { 0x04832018, "BioSimKey" },
     { 0x04832302, "Portable Flash Device (PFD)" },
+    { 0x0483347b, "ST-LINK/V2-1" },
     { 0x04833744, "STLINK Pseudo disk" },
     { 0x04833747, "ST Micro Connect Lite" },
     { 0x04833748, "ST-LINK/V2" },
@@ -5929,6 +5939,7 @@ static const value_string usb_products_vals[] = {
     { 0x0489e016, "Ubee PXU1900 WiMAX Adapter [Beceem BCSM250]" },
     { 0x0489e02c, "Atheros AR5BBU12 Bluetooth Device" },
     { 0x0489e040, "Vizio VTAB1008" },
+    { 0x0489e04d, "Atheros AR3012 Bluetooth" },
     { 0x048d1165, "IT1165 Flash Controller" },
     { 0x048d1336, "SD/MMC Cardreader" },
     { 0x048d1345, "Multi Cardreader" },
@@ -7369,6 +7380,7 @@ static const value_string usb_products_vals[] = {
     { 0x04d8f437, "SBE Tech Ultrasonic Anemometer" },
     { 0x04d8f4b5, "SmartScope" },
     { 0x04d8f8da, "Hughski Ltd. ColorHug" },
+    { 0x04d8f8e8, "Harmony 300/350 Remote" },
     { 0x04d8f91c, "SPROG IIv3" },
     { 0x04d8faff, "Dangerous Prototypes BusPirate v4 Bootloader mode" },
     { 0x04d8fb00, "Dangerous Prototypes BusPirate v4" },
@@ -7743,7 +7755,7 @@ static const value_string usb_products_vals[] = {
     { 0x04e8662e, "MITs Sync" },
     { 0x04e86630, "MITs Sync" },
     { 0x04e86632, "MITs Sync" },
-    { 0x04e8663e, "D900e Phone" },
+    { 0x04e8663e, "D900e/B2100 Phone" },
     { 0x04e8663f, "SGH-E720/SGH-E840" },
     { 0x04e86640, "Usb Modem Enumerator" },
     { 0x04e86642, "Samsung M7600 Beat/GT-S8300T/SGH-F490/S8300" },
@@ -7754,8 +7766,8 @@ static const value_string usb_products_vals[] = {
     { 0x04e86727, "Samsung F250 Mobile Phone" },
     { 0x04e86734, "Samsung Juke (SCH-U470)" },
     { 0x04e86752, "Samsung GT-B2700" },
-    { 0x04e86759, "D900e Media Player" },
-    { 0x04e8675a, "D900e Mass Storage" },
+    { 0x04e86759, "D900e/B2100 Media Player" },
+    { 0x04e8675a, "D900e/B2100 Mass Storage" },
     { 0x04e8675b, "D900e Camera" },
     { 0x04e86763, "Samsung SAMSUNG Trance" },
     { 0x04e86772, "Standalone LTE device (Trial)" },
@@ -8620,6 +8632,7 @@ static const value_string usb_products_vals[] = {
     { 0x054c05a8, "Sony NWZ-S765" },
     { 0x054c05b3, "Sony Sony Tablet S" },
     { 0x054c05b4, "Sony Sony Tablet S1" },
+    { 0x054c05c4, "DualShock 4" },
     { 0x054c061f, "Sony DSC-HX200V" },
     { 0x054c0689, "Walkman NWZ-B173F" },
     { 0x054c06bb, "WALKMAN NWZ-F805" },
@@ -8831,6 +8844,7 @@ static const value_string usb_products_vals[] = {
     { 0x056a00de, "CTH-470 [Bamboo Fun Pen & Touch]" },
     { 0x056a00f6, "Cintiq 24HD touch (DTH-2400) touchscreen" },
     { 0x056a00f8, "Cintiq 24HD touch (DTH-2400) tablet" },
+    { 0x056a0302, "Intuos CTH480S2 [Manga]" },
     { 0x056a0307, "Cintiq Companion Hybrid 13HD (DTH-A1300) tablet" },
     { 0x056a0309, "Cintiq Companion Hybrid 13HD (DTH-A1300) touchscreen" },
     { 0x056a030e, "Intuos Pen Small (CTL480)" },
@@ -9639,7 +9653,7 @@ static const value_string usb_products_vals[] = {
     { 0x05af9267, "KB 9251B - 678 Mouse" },
     { 0x05b11389, "Bluetooth Wireless Adapter" },
     { 0x05b44857, "M-Any DAH-210" },
-    { 0x05b46001, "Digisette DUO-MP3 AR-100" },
+    { 0x05b46001, "HYUNDAI GDS30C6001 SSFDC / MMC I/F Controller" },
     { 0x05b83002, "Scroll Mouse" },
     { 0x05ba0007, "Fingerprint Reader" },
     { 0x05ba0008, "Fingerprint Reader" },
@@ -9660,6 +9674,7 @@ static const value_string usb_products_vals[] = {
     { 0x05c69000, "SIMCom SIM5218 modem" },
     { 0x05c69001, "Gobi Wireless Modem" },
     { 0x05c69002, "Gobi Wireless Modem" },
+    { 0x05c69003, "Quectel UC20" },
     { 0x05c69008, "Gobi Wireless Modem (QDL mode)" },
     { 0x05c69018, "Qualcomm HSUSB Device" },
     { 0x05c69025, "Qualcomm HSUSB Device" },
@@ -9954,6 +9969,7 @@ static const value_string usb_products_vals[] = {
     { 0x05dca811, "16GB Gizmo!" },
     { 0x05dca813, "16gB flash thumb drive" },
     { 0x05dca815, "JumpDrive V10" },
+    { 0x05dca833, "JumpDrive S23 64GB" },
     { 0x05dcb002, "USB CF Reader" },
     { 0x05dcb018, "Multi-Card Reader" },
     { 0x05dcb047, "SDHC Reader [RW047-7000]" },
@@ -10201,6 +10217,7 @@ static const value_string usb_products_vals[] = {
     { 0x064ea136, "Asus Integrated Webcam [CN031B]" },
     { 0x064ea219, "1.3M WebCam (notebook emachines E730, Acer sub-brand)" },
     { 0x064ec107, "HP webcam [dv6-1190en]" },
+    { 0x064ec335, "HP TrueVision HD" },
     { 0x064ed101, "Acer CrystalEye Webcam" },
     { 0x064ed217, "HP TrueVision HD" },
     { 0x064ee201, "Lenovo Integrated Webcam" },
@@ -11124,6 +11141,7 @@ static const value_string usb_products_vals[] = {
     { 0x07632881, "M-Audio DFU" },
     { 0x07640005, "Cyber Power UPS" },
     { 0x07640501, "CP1500 AVR UPS" },
+    { 0x07640601, "PR1500LCDRT2U UPS" },
     { 0x07655001, "Huey PRO Colorimeter" },
     { 0x07655020, "i1 Display Pro" },
     { 0x07656003, "ColorMunki Smile" },
@@ -11419,6 +11437,7 @@ static const value_string usb_products_vals[] = {
     { 0x07b3090c, "OpticBook 3600 Plus Scanner" },
     { 0x07b30a06, "TVcam VD100" },
     { 0x07b30b00, "SmartPhoto F50" },
+    { 0x07b30c00, "OpticPro ST64 Scanner" },
     { 0x07b30c03, "OpticPro ST64+ Scanner" },
     { 0x07b30c04, "Optic Film 7200i scanner" },
     { 0x07b30c0c, "PL806 Scanner" },
@@ -11905,6 +11924,7 @@ static const value_string usb_products_vals[] = {
     { 0x08469040, "WNA1000 Wireless-N 150 [Atheros AR9170+AR9101]" },
     { 0x08469041, "WNA1000M 802.11bgn [Realtek RTL8188CUS]" },
     { 0x08469042, "On Networks N150MA 802.11bgn [Realtek RTL8188CUS]" },
+    { 0x08469043, "WNA1000Mv2 802.11bgn [Realtek RTL8188CUS?]" },
     { 0x08469050, "A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]" },
     { 0x08469052, "A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU]" },
     { 0x0846a001, "PA101 10 Mbps HPNA Home Phoneline RJ-1" },
@@ -12111,6 +12131,7 @@ static const value_string usb_products_vals[] = {
     { 0x08e30301, "RNIS" },
     { 0x08e40142, "Pioneer DVR-LX60D" },
     { 0x08e40148, "Pioneer XMP3" },
+    { 0x08e40184, "DDJ-WeGO" },
     { 0x08e40185, "DDJ-WeGO2" },
     { 0x08e60001, "GemPC-Touch 430" },
     { 0x08e60430, "GemPC430 SmartCard Reader" },
@@ -12267,6 +12288,7 @@ static const value_string usb_products_vals[] = {
     { 0x090c0373, "Silicon Motion Camera" },
     { 0x090c037a, "Silicon Motion Camera" },
     { 0x090c037b, "Silicon Motion Camera" },
+    { 0x090c037c, "300k Pixel Camera" },
     { 0x090c1000, "Flash Drive" },
     { 0x090c1132, "5-in-1 Card Reader" },
     { 0x090c337b, "Silicon Motion Camera" },
@@ -12281,6 +12303,7 @@ static const value_string usb_products_vals[] = {
     { 0x090c937b, "Silicon Motion Camera" },
     { 0x090cb370, "Silicon Motion SM370 Camera" },
     { 0x090cb371, "Silicon Motion SM371 Camera" },
+    { 0x090cf37d, "Endoscope camera" },
     { 0x0911149a, "SpeechMike II Pro Plus LFH5276" },
     { 0x09112512, "SpeechMike Pro" },
     { 0x09150001, "DSL Modem" },
@@ -12360,6 +12383,7 @@ static const value_string usb_products_vals[] = {
     { 0x09258800, "WiseGroup Ltd, MP-8800 Quad Joypad" },
     { 0x09258866, "WiseGroup Ltd, MP-8866 Dual Joypad" },
     { 0x09288000, "Firmware uploader" },
+    { 0x0928ffff, "Blank Oxford Device" },
     { 0x092f0004, "JTAG-4" },
     { 0x092f0005, "JTAG-5" },
     { 0x09300009, "Toshiba Gigabeat MEGF-40" },
@@ -13788,6 +13812,9 @@ static const value_string usb_products_vals[] = {
     { 0x0c4b0401, "cyberJack pinpad(a2)" },
     { 0x0c4b0500, "cyberJack RFID standard dual interface smartcard reader" },
     { 0x0c4b0501, "cyberJack RFID comfort dual interface smartcard reader" },
+    { 0x0c4b0502, "cyberJack compact" },
+    { 0x0c4b0504, "cyberJack go / go plus" },
+    { 0x0c4b0505, "cyberJack wave" },
     { 0x0c4b9102, "cyberJack RFID basis contactless smartcard reader" },
     { 0x0c4c0021, "EMP-21 Universal Programmer" },
     { 0x0c522101, "SeaLINK+232" },
@@ -13845,6 +13872,16 @@ static const value_string usb_products_vals[] = {
     { 0x0c550540, "SPI540" },
     { 0x0c555416, "TMS320C5416 DSK" },
     { 0x0c556416, "TMS320C6416 DDB" },
+    { 0x0c600001, "MiniMe" },
+    { 0x0c600002, "MiniDAC" },
+    { 0x0c600003, "ONE" },
+    { 0x0c600004, "GiO" },
+    { 0x0c600007, "Duet" },
+    { 0x0c600009, "Jam" },
+    { 0x0c60000a, "Jam Bootloader" },
+    { 0x0c60000b, "MiC" },
+    { 0x0c60000c, "MiC Bootloader" },
+    { 0x0c608007, "Duet DFU Mode" },
     { 0x0c6a0005, "Color 320 x 240 LCD Display Terminal with Touchscreen" },
     { 0x0c6c04b2, "Specbos 1201" },
     { 0x0c700000, "USB08 Development board" },
@@ -14213,6 +14250,9 @@ static const value_string usb_products_vals[] = {
     { 0x0db0a97a, "Bluetooth EDR Device" },
     { 0x0db0b970, "Bluetooth EDR Device" },
     { 0x0db0b97a, "Bluetooth EDR Device" },
+    { 0x0db50139, "LSR116 CDC" },
+    { 0x0db5013a, "LSR116 Keyboard" },
+    { 0x0db5013b, "LSR116 HID" },
     { 0x0db70002, "Goldpfeil P-LAN" },
     { 0x0dba1000, "Mbox 1 [Mbox]" },
     { 0x0dba3000, "Mbox 2" },
@@ -14429,6 +14469,7 @@ static const value_string usb_products_vals[] = {
     { 0x0e6f0003, "Freebird wireless Controller" },
     { 0x0e6f0005, "Eclipse wireless Controller" },
     { 0x0e6f0006, "Edge wireless Controller" },
+    { 0x0e6f0128, "Wireless PS3 Controller" },
     { 0x0e791106, "Pocket Media Assistant - PMA400" },
     { 0x0e791204, "Gmini XS 200" },
     { 0x0e791207, "Archos Gmini XS100" },
@@ -14488,6 +14529,7 @@ static const value_string usb_products_vals[] = {
     { 0x0e8f0016, "4 port USB 1.1 hub UH-174" },
     { 0x0e8f0020, "USB to PS/2 Adapter" },
     { 0x0e8f0021, "Multimedia Keyboard Controller" },
+    { 0x0e8f0022, "multimedia keyboard controller" },
     { 0x0e8f0201, "SmartJoy Frag Xpad/PS2 adaptor" },
     { 0x0e900100, "Storage Adapter V1" },
     { 0x0e96c001, "TRUST 380 USB2 SPACEC@M" },
@@ -14519,6 +14561,7 @@ static const value_string usb_products_vals[] = {
     { 0x0ed5f201, "Fiberbyte USB-inSync DAQ-2500X" },
     { 0x0edf2060, "FID irock! 100 Series" },
     { 0x0ee31000, "Image Tank 1.5" },
+    { 0x0ee40690, "SATA 3 Adapter" },
     { 0x0eee8810, "Mass Storage Drive" },
     { 0x0eef0001, "eGalax TouchScreen" },
     { 0x0eef0002, "Touchscreen Controller(Professional)" },
@@ -14761,7 +14804,7 @@ static const value_string usb_products_vals[] = {
     { 0x0fcee166, "Xperia Mini Pro" },
     { 0x0fcee167, "XPERIA mini" },
     { 0x0fcee19b, "C2005 [Xperia M dual] (Mass Storage)" },
-    { 0x0fcef0fa, "Liveview micro display MN800 in DFU mode" },
+    { 0x0fcef0fa, "MN800 / Smartwatch 2 (DFU mode)" },
     { 0x0fcf1003, "ANT Development Board" },
     { 0x0fcf1004, "ANTUSB Stick" },
     { 0x0fcf1006, "ANT Development Board" },
@@ -14810,6 +14853,7 @@ static const value_string usb_products_vals[] = {
     { 0x100461c5, "P880 / Charge only" },
     { 0x100461c6, "Vortex (msc)" },
     { 0x100461cc, "Optimus S" },
+    { 0x100461da, "G2 Android Phone [tethering mode]" },
     { 0x100461f1, "Optimus Android Phone [LG Software mode]" },
     { 0x100461f9, "LG Electronics Inc. V909 G-Slate" },
     { 0x100461fc, "Optimus 3" },
@@ -14817,7 +14861,7 @@ static const value_string usb_products_vals[] = {
     { 0x10046300, "Optimus Android Phone" },
     { 0x1004631c, "LG Electronics Inc. LG-E617G/P700" },
     { 0x1004631d, "Optimus Android Phone (Camera/PTP Mode)" },
-    { 0x1004631e, "Optimus Android Phone [Camera/PTP mode]" },
+    { 0x1004631e, "G2/Optimus Android Phone [Camera/PTP mode]" },
     { 0x1004631f, "Optimus Android Phone (Charge Mode)" },
     { 0x10046356, "Optimus Android Phone [Virtual CD mode]" },
     { 0x10046800, "CDMA Modem" },
@@ -14895,6 +14939,7 @@ static const value_string usb_products_vals[] = {
     { 0x10466694, "Generic W6694 USB" },
     { 0x10468901, "Bluetooth Device" },
     { 0x10469967, "W9967CF/W9968CF Webcam IC" },
+    { 0x10482010, "4-Port hub" },
     { 0x104d1003, "Model-52 LED Light Source Power Supply and Driver" },
     { 0x104f0001, "Infinity Phoenix" },
     { 0x104f0002, "Smartmouse" },
@@ -14905,9 +14950,12 @@ static const value_string usb_products_vals[] = {
     { 0x104f0008, "Infinity CryptoKey" },
     { 0x104f0009, "RE-BL PlayStation 3 IR-to-Bluetooth converter" },
     { 0x10500010, "Yubikey" },
-    { 0x10500110, "Yubikey NEO OTP" },
-    { 0x10500111, "Yubikey NEO OTP+CCID" },
-    { 0x10500112, "Yubikey NEO CCID" },
+    { 0x10500110, "Yubikey NEO(-N) OTP" },
+    { 0x10500111, "Yubikey NEO(-N) OTP+CCID" },
+    { 0x10500112, "Yubikey NEO(-N) CCID" },
+    { 0x10500113, "Yubikey NEO(-N) U2F" },
+    { 0x10500114, "Yubikey NEO(-N) OTP+U2F" },
+    { 0x10500115, "Yubikey NEO(-N) U2F+CCID" },
     { 0x10500200, "U2F Gnubby" },
     { 0x10500211, "Gnubby" },
     { 0x10545004, "DSL 7420 Loader" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 162f3ee71e..273e518235 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2015-03-06)
+(last updated 2015-03-13)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -2679,8 +2679,8 @@ Decimal
       ray.caruso&netvion.com
 666
   Oki Electric Industry Co., Ltd.
-    Shigeru Urushibara
-      uru&cs1.cs.oki.co.jp
+    Naoki Hayashi
+      hayashi753&oki.com
 667
   Specialix International
     Jeremy Rolls
@@ -14223,8 +14223,8 @@ Decimal
       dobrad&wnt.sas.com
 3555
   NetLock Ltd.
-    Zsolt Rozsahegyi
-      rozsahegyi_zs&netlock.net
+    Katalin Szűcs
+      szucs.katalin&netlock.hu
 3556
   GENO-RZ GmbH
     Herr Medovic
@@ -108611,9 +108611,9 @@ de l'Ouest(RESAO)
     Kare Langedrag
       kare&novasecure.no
 27259
-  Power-One
+  BEL POWER SOLUTIONS (formerly "Power-One")
     Juerg Labhart
-      juerg.labhart&power-one.com
+      juerg.labhart&psbel.com
 27260
   DynaPel Systems Inc.
     Dr. Dieter Koller
@@ -113923,9 +113923,9 @@ Decentralization / Helenic Public Administra
     Mike French
       macvoip&gmail.com
 28586
-  ELPRO Technologies Pty Ltd
+  EATON Wireless
     Harry Courtice
-      harry.courtice&elprotech.com
+      harrycourtice&eaton.com
 28587
   Mobilesoft (Aust) Pty Limited
     Cameron Hutchison
@@ -181359,6 +181359,194 @@ Decentralization / Helenic Public Administra
   ecg.local
     Ralf Balzer
       balzer&manthey.it
+45445
+  Kuantic SAS
+    Mike O'Dowd
+      modowd&kuantic.com
+45446
+  Ministerio Publico de la Acusación 
+    Ing. Alejandro Azario
+      aazario&mpa.santafe.gov.ar
+45447
+  SOCIETE DU FIGARO
+    Bruno Coutureau
+      bcoutureau&lefigaro.fr
+45448
+  UF Health Oncology - Baymeadows
+    Kathy Politano
+      kpolitano&21co.com
+45449
+  Blue Krait Consulting Inc.
+    Blair Sandberg
+      blair.sandberg&bluekrait.com
+45450
+  Parsec (Pty) Ltd
+    Francois Joubert
+      francoisj&parsec.co.za
+45451
+  reBTSOFT
+    Björn Ternes
+      bjoern.ternes&gmail.com
+45452
+  Instituto Medico Alexander Fleming
+    Mario Cazeneuve
+      mcazeneuve&alexanderfleming.org
+45453
+  Banff Cyber Technologies Pte Ltd
+    Alex Ngo
+      alexngo&banffcyber.com
+45454
+  Shanghai Digigrid Technology Co.,Ltd
+    Ivy Jiang
+      ivy.jiang&digigrid.com.cn
+45455
+  John Wason
+    John Wason
+      wason&wasontech.com
+45456
+  Galaxia Electronics Co., Ltd.
+    Hong-rae, Kim
+      hrkim&galaxia.co.kr
+45457
+  Kanton Thurgau
+    Patrik Stacher
+      patrik.stacher&tg.ch
+45458
+  VKBit Betrieb GmbH
+    Matthias Fischer
+      matthias.fischer&vkb.de
+45459
+  Lonix Oy
+    Jarmo Mitjonen
+      jm&lonix.com
+45460
+  Comfact AB
+    Anders Tornqvist
+      anders&comfact.com
+45461
+  Pocos bv
+    JordI Smits
+      jordi&pocos.nl
+45462
+  Koch-IT
+    Martin Koch
+      post&koch-it.de
+45463
+  Federal Public Service Justice, Belgium
+    David Roskams
+      ict.infra.pen&just.fgov.be
+45464
+  Verband Christlicher Pfadfinderinnen und Pfadfinder in Württemberg 
+    Frederik Held
+      frederik.held&wuerttemberg.vcp.de
+45465
+  Clear2Pay NV/SA
+    Dieter Boden-Schelfthout
+      dieter.boden&clear2pay.com
+45466
+  PIXEL Sp. z o.o.
+    Seweryn Kamiński
+      s.kaminski&pixel.pl
+45467
+  Vidat
+    Jochen Ulbricht
+      j.ulbricht&vidat.eu
+45468
+  Avi Networks
+    Anand Parthasarathy
+      anpartha&avinetworks.com
+45469
+  IQ Messenger
+    Ramazan Aslan
+      r.aslan&iqmessenger.com
+45470
+  Azienda Ospedaliero-Universitaria di Bologna
+    Luca Boccafogli
+      luca.boccafogli&aosp.bo.it
+45471
+  Triangle Wholefoods Collective Ltd.
+    Pod Andrews
+      pod&suma.coop
+45472
+  Ebee Smart Technologies GmbH
+    Robert Weyrauch
+      iana&ebeesmarttechnologies.de
+45473
+  Excelfore Corporation
+    Anoop Balakrishnan
+      admin&excelfore.com
+45474
+  HfMT Hamburg
+    Axel Schnellbügel
+      axel.schnellbuegel&hfmt-hamburg.de
+45475
+  MEYTEC GmbH
+    Gerhard W. Meyer
+      info&meytec.com
+45476
+  StreamVue Ltd
+    Sonia Griffiths
+      hostmaster&streamvue.com
+45477
+  ZOO Digital Group plc.
+    Stuart Green
+      stuart.green&zoodigital.com
+45478
+  DIVA IT SIA
+    Dmitrijs Petrovs
+      dmitrijs.petrovs&divait.lv
+45479
+  PXP Solutions Ltd
+    James Russell
+      hostmaster&pxp-solutions.com
+45480
+  Packetwerk GmbH
+    Sven Roethig
+      s.roethig&packetwerk.de
+45481
+  Galore Networks Private Limited
+    Balaji Kulothungan
+      balajik&ga-lore.com
+45482
+  St Jude Medical
+    Eric Crist
+      ecrist&sjm.com
+45483
+  FusionLayer, Inc.
+    Rauno Haapaniemi
+      snmp-admin&fusionlayer.com
+45484
+  Siama Systems Inc.
+    Marco Mascitto
+      marco.mascitto&siamasystems.com
+45485
+  SCUBI
+    Justin Jensen
+      justin.jensen&capgemini-gs.com
+45486
+  ACSS Communications Pty Ltd
+    Alex Lodge
+      AlexL&acsscomms.com.au
+45487
+  Polydata Corporate
+    Jing Kang
+      jing.kang&polydata.com.cn
+45488
+  KONAR
+    Anton Myachin
+      noc&konar.ru
+45489
+  groupe-alpha
+    Alain Mouilleron
+      iana&groupe-alpha.com
+45490
+  Nexperteam
+    Nathan Van Overloop
+      operations&nexperteam.be
+45491
+  Gainde 2000
+    Magatte MBAYE
+      mmbaye&gainde2000.sn
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 2dac4f658b..7afd20753e 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -27279,7 +27279,7 @@ const value_string sminmpec_values[] = {
     { 27256, "NPF \"KRUG\"" },
     { 27257, "Valimo Wireless Oy" },
     { 27258, "NovaSecure AS" },
-    { 27259, "Power-One" },
+    { 27259, "BEL POWER SOLUTIONS (formerly \"Power-One\")" },
     { 27260, "DynaPel Systems Inc." },
     { 27261, "Servicios Avanzados para las Instituciones S.L." },
     { 27262, "DANTE Ltd." },
@@ -28606,7 +28606,7 @@ const value_string sminmpec_values[] = {
     { 28583, "Tangent Systems, Inc." },
     { 28584, "Allegro Networks pty ltd" },
     { 28585, "Sniddle LLC" },
-    { 28586, "ELPRO Technologies Pty Ltd" },
+    { 28586, "EATON Wireless" },
     { 28587, "Mobilesoft (Aust) Pty Limited" },
     { 28588, "Kaplan Software, LLC" },
     { 28589, "IDERs Inc" },
@@ -45465,6 +45465,53 @@ const value_string sminmpec_values[] = {
     { 45442, "Wroc\0305\0202aw University of Technology" },
     { 45443, "Arca Sistemi Scarl" },
     { 45444, "ecg.local" },
+    { 45445, "Kuantic SAS" },
+    { 45446, "Ministerio Publico de la Acusaci\0303\0263n " },
+    { 45447, "SOCIETE DU FIGARO" },
+    { 45448, "UF Health Oncology - Baymeadows" },
+    { 45449, "Blue Krait Consulting Inc." },
+    { 45450, "Parsec (Pty) Ltd" },
+    { 45451, "reBTSOFT" },
+    { 45452, "Instituto Medico Alexander Fleming" },
+    { 45453, "Banff Cyber Technologies Pte Ltd" },
+    { 45454, "Shanghai Digigrid Technology Co.,Ltd" },
+    { 45455, "John Wason" },
+    { 45456, "Galaxia Electronics Co., Ltd." },
+    { 45457, "Kanton Thurgau" },
+    { 45458, "VKBit Betrieb GmbH" },
+    { 45459, "Lonix Oy" },
+    { 45460, "Comfact AB" },
+    { 45461, "Pocos bv" },
+    { 45462, "Koch-IT" },
+    { 45463, "Federal Public Service Justice, Belgium" },
+    { 45464, "Verband Christlicher Pfadfinderinnen und Pfadfinder in W\0303\0274rttemberg " },
+    { 45465, "Clear2Pay NV/SA" },
+    { 45466, "PIXEL Sp. z o.o." },
+    { 45467, "Vidat" },
+    { 45468, "Avi Networks" },
+    { 45469, "IQ Messenger" },
+    { 45470, "Azienda Ospedaliero-Universitaria di Bologna" },
+    { 45471, "Triangle Wholefoods Collective Ltd." },
+    { 45472, "Ebee Smart Technologies GmbH" },
+    { 45473, "Excelfore Corporation" },
+    { 45474, "HfMT Hamburg" },
+    { 45475, "MEYTEC GmbH" },
+    { 45476, "StreamVue Ltd" },
+    { 45477, "ZOO Digital Group plc." },
+    { 45478, "DIVA IT SIA" },
+    { 45479, "PXP Solutions Ltd" },
+    { 45480, "Packetwerk GmbH" },
+    { 45481, "Galore Networks Private Limited" },
+    { 45482, "St Jude Medical" },
+    { 45483, "FusionLayer, Inc." },
+    { 45484, "Siama Systems Inc." },
+    { 45485, "SCUBI" },
+    { 45486, "ACSS Communications Pty Ltd" },
+    { 45487, "Polydata Corporate" },
+    { 45488, "KONAR" },
+    { 45489, "groupe-alpha" },
+    { 45490, "Nexperteam" },
+    { 45491, "Gainde 2000" },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index 3246653947..e74b6ff60f 100644
--- a/manuf
+++ b/manuf
@@ -5122,7 +5122,7 @@
 00:13:E9	Veriwave               # VeriWave, Inc.
 00:13:EA	Kamstrup               # Kamstrup A/S
 00:13:EB	Sysmaste               # Sysmaster Corporation
-00:13:EC	SunbaySo               # Sunbay Software AG
+00:13:EC	Netsnapp               # Netsnapper Technologies SARL
 00:13:ED	Psia
 00:13:EE	JbxDesig               # JBX Designs Inc.
 00:13:EF	KingjonD               # Kingjon Digital Technology Co.,Ltd
@@ -10559,7 +10559,7 @@
 00:40:33	AddtronT               # ADDTRON TECHNOLOGY CO., LTD.
 00:40:34	Bustek                 # BUSTEK CORPORATION
 00:40:35	Opcom
-00:40:36	TribeCom               # TRIBE COMPUTER WORKS, INC.
+00:40:36	ZoomTele               # Zoom Telephonics, Inc
 00:40:37	Sea-Ilan               # SEA-ILAN, INC.
 00:40:38	TalentEl               # TALENT ELECTRIC INCORPORATED
 00:40:39	OptecDai               # OPTEC DAIICHI DENKO CO., LTD.
@@ -17335,6 +17335,7 @@
 08:37:3D	SamsungE               # Samsung Electronics Co.,Ltd
 08:37:9C	Topaz                  # Topaz Co. LTD.
 08:38:A5	Funkwerk               # Funkwerk plettac electronic GmbH
+08:3A:5C	Junilab                # Junilab, Inc.
 08:3A:B8	ShinodaP               # Shinoda Plasma Co., Ltd.
 08:3D:88	SamsungE               # Samsung Electronics Co.,Ltd
 08:3E:0C	ArrisGro               # ARRIS Group, Inc.
@@ -17547,6 +17548,7 @@
 0C:F5:A4	Cisco
 0C:F8:93	ArrisGro               # ARRIS Group, Inc.
 0C:FC:83	AirohaTe               # Airoha Technology Corp.,
+0C:FE:45	SonyComp               # Sony Computer Entertainment Inc.
 10:00:00	Private
 10:00:5A	Ibm                    # IBM Corp
 10:00:90	HP
@@ -17845,6 +17847,7 @@
 18:59:33	CiscoSpv               # Cisco SPVTG
 18:59:36	Xiaomi                 # XIAOMI INC
 18:5A:E8	Zenotech               # Zenotech.Co.,Ltd
+18:5D:9A	Bobjgear               # BobjGear LLC
 18:62:2C	Sagemcom               # SAGEMCOM SAS
 18:64:72	ArubaNet               # Aruba Networks
 18:65:71	TopVicto               # Top Victory Electronics (Taiwan) Co., Ltd.
@@ -18088,6 +18091,7 @@
 20:5B:5E	Shenzhen               # Shenzhen Wonhe Technology Co., Ltd
 20:5C:FA	Yangzhou               # Yangzhou ChangLian Network Technology Co,ltd.
 20:62:74	Microsof               # Microsoft Corporation
+20:63:5F	Abeeway
 20:64:32	SamsungE               # SAMSUNG ELECTRO MECHANICS CO.,LTD.
 20:67:B1	Pluto                  # Pluto inc.
 20:68:9D	LiteonTe               # Liteon Technology Corporation
@@ -18566,6 +18570,7 @@
 30:85:A9	AsustekC               # Asustek Computer Inc
 30:87:30	Shenzhen               # Shenzhen Huawei Communication Technologies Co., Ltd
 30:89:99	Guangdon               # Guangdong East Power Co.,
+30:89:D3	Hongkong               # HONGKONG UCLOUDLINK NETWORK TECHNOLOGY LIMITED
 30:8C:FB	Dropcam
 30:90:AB	Apple
 30:91:8F	Technico               # Technicolor
@@ -18872,6 +18877,7 @@
 3C:2D:B7	TexasIns               # Texas Instruments
 3C:2F:3A	Sforzato               # SFORZATO Corp.
 3C:30:0C	DewarEle               # Dewar Electronics Pty Ltd
+3C:31:78	Qolsys                 # Qolsys Inc.
 3C:36:3D	Nokia                  # Nokia Corporation
 3C:36:E4	ArrisGro               # Arris Group, Inc.
 3C:38:88	Connectq               # ConnectQuest, llc
@@ -19884,9 +19890,11 @@
 4C:AA:16	Azurewav               # AzureWave Technologies (Shanghai) Inc.
 4C:AB:33	KstTechn               # KST technology
 4C:AC:0A	Zte                    # ZTE Corporation
+4C:AE:31	Shenghai               # ShengHai Electronics (Shenzhen) Ltd
 4C:B1:6C	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 4C:B1:99	Apple
 4C:B4:EA	HrdSPte                # HRD (S) PTE., LTD.
+4C:B7:6D	NoviSecu               # Novi Security
 4C:B8:1C	SamElect               # SAM Electronics GmbH
 4C:B9:C8	Conet                  # CONET CO., LTD.
 4C:BA:A3	BisonEle               # Bison Electronics Inc.
@@ -20326,6 +20334,7 @@
 5C:A4:8A	Cisco
 5C:AA:FD	Sonos                  # Sonos, Inc.
 5C:AC:4C	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
+5C:B3:95	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 5C:B4:3E	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 5C:B5:24	SonyEric               # Sony Ericsson Mobile Communications AB
 5C:B6:CC	Novacomm               # NovaComm Technologies Inc.
@@ -20504,6 +20513,7 @@
 60:FE:F9	ThomasBe               # Thomas & Betts
 60:FF:DD	CEElectr               # C.E. ELECTRONICS, INC
 64:00:2D	Powerlin               # Powerlinq Co., LTD
+64:00:6A	Dell                   # Dell Inc.
 64:00:F1	Cisco                  # CISCO SYSTEMS, INC.
 64:05:BE	NewLight               # NEW LIGHT LED
 64:09:4C	BeijingS               # Beijing Superbee Wireless Technology Co.,Ltd
@@ -20897,6 +20907,7 @@
 70:23:93	Fos4x                  # fos4X GmbH
 70:25:26	Alcatel-               # Alcatel-Lucent
 70:25:59	Cybertan               # CyberTAN Technology, Inc.
+70:2A:7D	Epspot                 # EpSpot AB
 70:2B:1D	E-DomusI               # E-Domus International Limited
 70:2C:1F	Wisol
 70:2D:D1	NewingsC               # Newings Communication CO., LTD.
@@ -20999,6 +21010,7 @@
 70:B3:D5:07:70:00/36	Inaccess               # InAccess Networks SA
 70:B3:D5:07:80:00/36	Orbiwise               # OrbiWise SA
 70:B3:D5:07:D0:00/36	Panorami               # PANORAMIC POWER
+70:B3:D5:08:70:00/36	TempusFu               # Tempus Fugit Consoles bvba
 70:B3:D5:08:E0:00/36	BeijingC               # Beijing CONvision Technology Co.,Ltd
 70:B3:D5:08:F0:00/36	Deuta-We               # DEUTA-WERKE GmbH
 70:B3:D5:09:00:00/36	Powercra               # POWERCRAFT ELECTRONICS PVT. LTD.
@@ -21018,9 +21030,11 @@
 70:B3:D5:0C:D0:00/36	AmlOcean               # AML Oceanographic
 70:B3:D5:0D:60:00/36	TattileS               # TATTILE SRL
 70:B3:D5:0D:70:00/36	RussianT               # Russian Telecom Equipment Company
+70:B3:D5:0D:80:00/36	LaserIma               # Laser Imagineering GmbH
 70:B3:D5:0D:C0:00/36	Talleres               # Talleres de Escoriaza
 70:B3:D5:0D:F0:00/36	BEASa                  # B.E.A. sa
 70:B3:D5:0E:00:00/36	Plcis
+70:B3:D5:0E:60:00/36	Nasdaq
 70:B3:D5:0E:C0:00/36	AcsMotio               # ACS MOTION CONTROL
 70:B3:D5:0F:00:00/36	Avionica
 70:B3:D5:0F:B0:00/36	CygnusLl               # Cygnus LLC
@@ -21143,6 +21157,7 @@
 70:B3:D5:48:C0:00/36	Integrat               # Integrated Systems Engineering, Inc.
 70:B3:D5:48:D0:00/36	OmegaBil               # OMEGA BILANCE SRL SOCIETA' UNIPERSONALE
 70:B3:D5:4A:A0:00/36	TwowayCo               # Twoway Communications, Inc.
+70:B3:D5:4A:D0:00/36	Gaci
 70:B3:D5:4B:10:00/36	LaceLlc                # LACE LLC.
 70:B3:D5:4B:B0:00/36	Plazma-T
 70:B3:D5:4C:10:00/36	QuercusT               # QUERCUS TECHNOLOGIES, S. L.
@@ -21210,6 +21225,7 @@
 70:B3:D5:6A:50:00/36	AkenoriP               # Akenori PTE LTD
 70:B3:D5:6B:30:00/36	Duracomm               # DuraComm Corporation
 70:B3:D5:6B:60:00/36	Inradios               # INRADIOS GmbH
+70:B3:D5:6B:B0:00/36	Luceo
 70:B3:D5:6D:10:00/36	VisualEn               # Visual Engineering Technologies Ltd
 70:B3:D5:6D:30:00/36	Deuta-We               # DEUTA-WERKE GmbH
 70:B3:D5:6D:60:00/36	Kmtronic               # KMtronic Ltd.
@@ -21258,6 +21274,7 @@
 70:B3:D5:7B:80:00/36	Serenerg               # SerEnergy A/S
 70:B3:D5:7C:D0:00/36	Molekule               # Molekuler Goruntuleme A.S.
 70:B3:D5:7C:E0:00/36	AplexTec               # Aplex Technology Inc.
+70:B3:D5:7E:40:00/36	C21                    # C21 Systems Ltd
 70:B3:D5:7E:70:00/36	Atessa                 # Atessa, Inc.
 70:B3:D5:7E:F0:00/36	Cravis                 # CRAVIS CO., LIMITED
 70:B3:D5:7F:10:00/36	Aerovisi               # AeroVision Avionics, Inc.
@@ -21372,6 +21389,7 @@
 70:B3:D5:B2:90:00/36	Wivicom                # WiViCom Co., Ltd.
 70:B3:D5:B2:A0:00/36	MyroCont               # Myro Control, LLC
 70:B3:D5:B3:30:00/36	AplexTec               # Aplex Technology Inc.
+70:B3:D5:B3:50:00/36	Rexxam                 # Rexxam Co.,Ltd.
 70:B3:D5:B3:90:00/36	MbConnec               # MB Connect Line GmbH
 70:B3:D5:B3:C0:00/36	DorletSa               # DORLET SAU
 70:B3:D5:B3:D0:00/36	Inras                  # Inras GmbH
@@ -21522,10 +21540,13 @@
 70:B3:D5:EF:A0:00/36	NexteraE               # NextEra Energy Resources, LLC
 70:B3:D5:EF:B0:00/36	PxmSpK                 # PXM sp.k.
 70:B3:D5:EF:E0:00/36	MeidenSy               # MEIDEN SYSTEM SOLUTIONS
+70:B3:D5:F0:10:00/36	Software               # Software Systems Plus
 70:B3:D5:F1:00:00/36	RieglLas               # Riegl Laser Measurement Systems GmbH
+70:B3:D5:F1:E0:00/36	AtxNetwo               # ATX NETWORKS LTD
 70:B3:D5:F2:A0:00/36	WibondIn               # WIBOND Informationssysteme GmbH
 70:B3:D5:F2:B0:00/36	Sensys                 # SENSYS GmbH
 70:B3:D5:F2:C0:00/36	HengenTe               # Hengen Technologies GmbH
+70:B3:D5:F2:D0:00/36	IdLockAs               # ID Lock AS
 70:B3:D5:F3:40:00/36	MacgrayS               # MacGray Services
 70:B3:D5:F3:60:00/36	Dinosys
 70:B3:D5:F3:80:00/36	Scanvaeg               # Scanvaegt Nordic A/S
@@ -21542,6 +21563,7 @@
 70:B3:D5:F8:C0:00/36	European               # EUROPEAN ADVANCED TECHNOLOGIES
 70:B3:D5:F8:E0:00/36	Isabelle               # Isabellenhütte Heusler Gmbh &Co KG
 70:B3:D5:F9:20:00/36	Techone
+70:B3:D5:F9:60:00/36	Ecologic               # Ecologicsense
 70:B3:D5:FA:10:00/36	BbiEngin               # BBI Engineering, Inc.
 70:B3:D5:FA:20:00/36	SarokalT               # Sarokal Test Systems Oy
 70:B3:D5:FA:40:00/36	Energybo               # Energybox Limited
@@ -22021,6 +22043,7 @@
 80:38:BC	HuaweiTe               # Huawei Technologies Co., Ltd
 80:38:FD	Leapfrog               # LeapFrog Enterprises, Inc.
 80:39:E5	Patlite                # PATLITE CORPORATION
+80:3B:2A	AbbXiame               # ABB Xiamen Low Voltage Equipment Co.,Ltd.
 80:3B:9A	Ghe-CesE               # ghe-ces electronic ag
 80:3F:5D	Winstars               # Winstars Technology Ltd
 80:3F:D6	BytesAtW               # bytes at work AG
@@ -22054,6 +22077,7 @@
 80:79:AE	Shandong               # ShanDong Tecsunrise  Co.,Ltd
 80:7A:7F	AbbGenwa               # ABB Genway Xiamen Electrical Equipment CO., LTD
 80:7B:1E	CorsairC               # Corsair Components
+80:7B:85	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
 80:7D:1B	Neosyste               # Neosystem Co. Ltd.
 80:7D:E3	Chongqin               # Chongqing Sichuan Instrument Microcircuit Co.LTD.
 80:81:A5	Tongqing               # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd
@@ -22071,6 +22095,7 @@
 80:96:CA	HonHaiPr               # Hon Hai Precision Ind Co.,Ltd
 80:97:1B	Altenerg               # Altenergy Power System,Inc.
 80:9B:20	IntelCor               # Intel Corporate
+80:9F:AB	Fiberhom               # Fiberhome Telecommunication Technologies Co.,LTD
 80:A1:D7	Shanghai               # Shanghai DareGlobal Technologies Co.,Ltd
 80:A8:5D	Osterhou               # Osterhout Design Group
 80:AA:A4	Usag
@@ -22308,6 +22333,7 @@
 88:9C:A6	BtbKorea               # BTB Korea INC
 88:9F:FA	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 88:A2:5E	JuniperN               # juniper networks
+88:A2:D7	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 88:A3:CC	AmatisCo               # Amatis Controls
 88:A5:BD	Qpcom                  # QPCOM INC.
 88:A7:3C	Ragentek               # Ragentek Technology Group
@@ -22606,6 +22632,7 @@
 94:01:C2	SamsungE               # Samsung Electronics Co.,Ltd
 94:04:9C	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 94:05:B6	LilingFu               # Liling FullRiver Electronics & Technology Ltd
+94:09:37	Humax                  # HUMAX Co., Ltd.
 94:0B:2D	NetviewT               # NetView Technologies(Shenzhen) Co., Ltd
 94:0B:D5	HimaxTec               # Himax Technologies, Inc
 94:0C:6D	Tp-LinkT               # TP-LINK Technologies Co.,Ltd.
@@ -22948,6 +22975,7 @@ A0:0C:A1	SktbSkit               # SKTB SKiT
 A0:12:90	Avaya                  # Avaya, Inc
 A0:12:DB	TabuchiE               # TABUCHI ELECTRIC CO.,LTD
 A0:13:3B	HitiDigi               # HiTi Digital, Inc.
+A0:13:CB	Fiberhom               # Fiberhome Telecommunication Technologies Co.,LTD
 A0:14:3D	ParrotSa               # PARROT SA
 A0:16:5C	Triteka                # Triteka LTD
 A0:18:28	Apple                  # Apple Inc
@@ -23018,6 +23046,7 @@ A0:9B:BD	TotalAvi               # Total Aviation Solutions Pty Ltd
 A0:A1:30	DliTaiwa               # DLI Taiwan Branch office
 A0:A2:3C	Gpms
 A0:A3:E2	Actionte               # Actiontec Electronics, Inc
+A0:A6:5C	Supercom               # Supercomputing Systems AG
 A0:A7:63	Polytron               # Polytron Vertrieb GmbH
 A0:A8:CD	IntelCor               # Intel Corporate
 A0:AA:FD	Erathink               # EraThink Technologies Corp.
@@ -23751,6 +23780,7 @@ B8:AE:6E	Nintendo               # Nintendo Co., Ltd.
 B8:AE:ED	Elitegro               # Elitegroup Computer Systems Co., Ltd.
 B8:AF:67	Hewlett-               # Hewlett-Packard Company
 B8:B1:C7	Bt&Com                 # BT&COM CO.,LTD
+B8:B3:DC	DerekSha               # DEREK (SHAOGUAN) LIMITED
 B8:B4:2E	GioneeCo               # Gionee Communication Equipment Co,Ltd.ShenZhen
 B8:B7:D7	2gigTech               # 2GIG Technologies
 B8:B8:1E	IntelCor               # Intel Corporate
@@ -24165,6 +24195,7 @@ C8:02:A6	BeijingN               # Beijing Newmine Technology
 C8:07:18	Tdsi
 C8:08:E9	LgElectr               # LG Electronics
 C8:0A:A9	QuantaCo               # Quanta Computer Inc.
+C8:0E:14	AvmAudio               # AVM Audiovisuelles Marketing und Computersysteme GmbH
 C8:0E:77	LeShiZhi               # Le Shi Zhi Xin Electronic Technology (Tianjin)  Co.,Ltd
 C8:0E:95	Omnilync               # OmniLync Inc.
 C8:14:79	SamsungE               # Samsung Electronics Co.,Ltd
@@ -24409,6 +24440,7 @@ CC:FC:6D	RizTrans               # RIZ TRANSMITTERS
 CC:FC:B1	Wireless               # Wireless Technology, Inc.
 CC:FE:3C	SamsungE               # Samsung Electronics
 D0:03:4B	Apple                  # Apple Inc
+D0:04:92	Fiberhom               # Fiberhome Telecommunication Technologies Co.,LTD
 D0:07:90	TexasIns               # Texas Instruments
 D0:0A:AB	Yokogawa               # Yokogawa Digital Computer Corporation
 D0:0E:A4	PorscheC               # Porsche Cars North America
@@ -24431,6 +24463,7 @@ D0:31:10	IngenicS               # Ingenic Semiconductor Co.,Ltd
 D0:37:61	TexasIns               # Texas Instruments
 D0:39:72	TexasIns               # Texas Instruments
 D0:39:B3	ArrisGro               # ARRIS Group, Inc.
+D0:43:1E	Dell                   # Dell Inc.
 D0:46:DC	Southwes               # Southwest Research Institute
 D0:48:F3	Dattus                 # DATTUS Inc
 D0:4C:C1	Sintrone               # SINTRONES Technology Corp.
@@ -24890,6 +24923,7 @@ DC:F7:55	Sitronik
 DC:F8:58	LorentNe               # Lorent Networks, Inc.
 DC:FA:D5	StrongGe               # STRONG Ges.m.b.H.
 DC:FB:02	Buffalo                # Buffalo Inc.
+E0:03:70	Shenzhen               # ShenZhen Continental Wireless Technology Co., Ltd.
 E0:05:C5	Tp-LinkT               # TP-LINK Technologies Co.,Ltd.
 E0:06:E6	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 E0:0B:28	Inovonic               # Inovonics
@@ -25145,6 +25179,7 @@ E8:28:D5	CotsTech               # Cots Technology
 E8:2A:EA	IntelCor               # Intel Corporate
 E8:2E:24	OutOfFog               # Out of the Fog Research LLC
 E8:33:81	ArrisGro               # ARRIS Group, Inc.
+E8:37:7A	ZyxelCom               # ZyXEL Communications Corporation
 E8:39:35	HewlettP               # Hewlett Packard
 E8:39:DF	AskeyCom               # Askey Computer
 E8:3A:97	OczTechn               # OCZ Technology Group
@@ -25518,6 +25553,7 @@ F4:54:33	Rockwell               # Rockwell Automation
 F4:55:95	Hengbao                # HENGBAO Corporation LTD.
 F4:55:9C	HuaweiTe               # Huawei Technologies Co., Ltd
 F4:55:E0	NicewayC               # Niceway CNC Technology Co.,Ltd.Hunan Province
+F4:57:3E	Fiberhom               # Fiberhome Telecommunication Technologies Co.,LTD
 F4:58:42	BoxxTv                 # Boxx TV Ltd
 F4:5F:69	MatsufuE               # Matsufu Electronics distribution Company
 F4:5F:D4	CiscoSpv               # Cisco SPVTG
@@ -25575,6 +25611,7 @@ F4:DD:9E	Gopro
 F4:E1:42	DeltaEle               # Delta Elektronika BV
 F4:E3:FB	HuaweiTe               # Huawei Technologies Co., Ltd
 F4:E6:D7	SolarPow               # Solar Power Technologies, Inc.
+F4:E9:D4	Qlogic                 # QLogic Corporation
 F4:EA:67	Cisco                  # CISCO SYSTEMS, INC.
 F4:EC:38	Tp-LinkT               # TP-LINK TECHNOLOGIES CO., LTD.
 F4:EE:14	Shenzhen               # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
@@ -25663,6 +25700,7 @@ F8:8F:CA	GoogleFi               # Google Fiber, Inc
 F8:91:2A	GlpGerma               # GLP German Light Products GmbH
 F8:93:F3	Volans
 F8:95:50	ProtonPr               # Proton Products Chengdu Ltd
+F8:95:C7	LgElectr               # LG Electronics (Mobile Communications)
 F8:97:CF	Daeshin-               # DAESHIN-INFORMATION TECHNOLOGY CO., LTD.
 F8:99:55	Fortress               # Fortress Technology Inc
 F8:9D:0D	ControlT               # Control Technology Inc.
diff --git a/services b/services
index 728e974daf..f127ea4a40 100644
--- a/services
+++ b/services
@@ -37,8 +37,8 @@ chargen            19/udp # Character Generator
 ftp-data           20/tcp # File Transfer [Default Data] [Jon_Postel] [Jon_Postel]
 ftp-data           20/udp # File Transfer [Default Data] [Jon_Postel] [Jon_Postel]
 ftp-data           20/sctp # FTP [Randall_Stewart] [Randall_Stewart] [RFC4960]
-ftp                21/tcp # File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path>
-ftp                21/udp # File Transfer [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path>
+ftp                21/tcp # File Transfer Protocol [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path>
+ftp                21/udp # File Transfer Protocol [Control] [Jon_Postel] [Jon_Postel] [RFC959] Defined TXT keys: u=<username> p=<password> path=<path>
 ftp                21/sctp # FTP [Randall_Stewart] [Randall_Stewart] [RFC4960] Defined TXT keys: u=<username> p=<password> path=<path>
 ssh                22/tcp # The Secure Shell (SSH) Protocol [RFC4251] Defined TXT keys: u=<username> p=<password>
 ssh                22/udp # The Secure Shell (SSH) Protocol [RFC4251] Defined TXT keys: u=<username> p=<password>
@@ -10164,6 +10164,7 @@ etlservicemgr    9001/tcp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea
 etlservicemgr    9001/udp # ETL Service Manager [Stephen_McCrea] [Stephen_McCrea] 2002-03 Known Unauthorized Use on port 9001
 dynamid          9002/tcp # DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03
 dynamid          9002/udp # DynamID authentication [Jerome_Dusautois] [Jerome_Dusautois] 2002-03
+golem            9005/tcp # Golem Inter-System RPC [Jose_Luis_Tallon] [Jose_Luis_Tallon] 2015-03-09
 ogs-client       9007/udp # Open Grid Services Client [Gareth_Nelson_2] [Gareth_Nelson_2] 2008-08-22
 ogs-server       9008/tcp # Open Grid Services Server [Gareth_Nelson_2] [Gareth_Nelson_2] 2008-08-22
 pichat           9009/tcp # Pichat Server [Mark_Seuffert] [Mark_Seuffert] 2004-11
@@ -11376,6 +11377,7 @@ m3da-disc       44900/udp # M3DA Discovery is used for efficient machine-to-mach
 asmp            45000/tcp # NSi AutoStore Status Monitoring Protocol data transfer [Notable_Solutions_Inc] [Andrew_Andrews] 2011-09-01
 asmp-mon        45000/udp # NSi AutoStore Status Monitoring Protocol device monitoring [Notable_Solutions_Inc] [Andrew_Andrews] 2011-09-01
 asmps           45001/tcp # NSi AutoStore Status Monitoring Protocol secure data transfer [Notable_Solutions_Inc] [Andrew_Andrews] 2011-09-01
+rs-status       45002/tcp # Redspeed Status Monitor [Redspeed_International_Ltd] [Simon_Griffiths] 2015-03-10
 synctest        45045/tcp # Remote application control protocol [Eleks_Ltd] [Andriy_Skop] 2013-04-08
 invision-ag     45054/tcp # InVision AG [Matthias_Schroer] [Matthias_Schroer]
 invision-ag     45054/udp # InVision AG [Matthias_Schroer] [Matthias_Schroer]