[Automatic update for 2015-09-20]

Update manuf, services enterprise-numbers, translations, and other items.

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

5 files changed, 364 insertions, 19 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 88922b2a62..6e08accc00 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -3138,6 +3138,7 @@ static const value_string usb_products_vals[] = {
     { 0x03f00212, "DeskJet 1220C" },
     { 0x03f00217, "LaserJet 2200" },
     { 0x03f00218, "APOLLO P2500/2600" },
+    { 0x03f00221, "StreamSmart 400 [F2235AA]" },
     { 0x03f0022a, "Laserjet CP1525nw" },
     { 0x03f00241, "Link-5 micro dongle" },
     { 0x03f00304, "DeskJet 810c/812c" },
@@ -3677,7 +3678,7 @@ static const value_string usb_products_vals[] = {
     { 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" },
+    { 0x04036001, "FT232 Serial (UART) IC" },
     { 0x04036002, "Lumel PD12" },
     { 0x04036007, "Serial Converter" },
     { 0x04036008, "Serial Converter" },
@@ -6368,6 +6369,7 @@ static const value_string usb_products_vals[] = {
     { 0x04a91909, "CanoScan LiDE 110" },
     { 0x04a9190a, "CanoScan LiDE 210" },
     { 0x04a9190d, "CanoScan 9000F Mark II" },
+    { 0x04a9190e, "CanoScan LiDE 120" },
     { 0x04a92200, "CanoScan LiDE 25" },
     { 0x04a92201, "CanoScan FB320U" },
     { 0x04a92202, "CanoScan FB620U" },
@@ -6779,10 +6781,14 @@ static const value_string usb_products_vals[] = {
     { 0x04a93289, "PowerShot ELPH 340 HS / IXUS 265 HS" },
     { 0x04a9328a, "PowerShot ELPH 150 IS / IXUS 155" },
     { 0x04a9328b, "PowerShot N Facebook(R) Ready" },
+    { 0x04a93299, "EOS M3" },
     { 0x04a9329a, "PowerShot SX60 HS" },
     { 0x04a9329b, "PowerShot SX520 HS" },
     { 0x04a9329c, "PowerShot SX400 IS" },
     { 0x04a9329f, "PowerShot SX530 HS" },
+    { 0x04a932a6, "PowerShot SX710 HS" },
+    { 0x04a932aa, "Powershot ELPH 160 / IXUS 160" },
+    { 0x04a932ac, "PowerShot ELPH 170 IS / IXUS 170" },
     { 0x04ad2501, "Bluetooth Device" },
     { 0x04b00102, "Coolpix 990" },
     { 0x04b00103, "Coolpix 880" },
@@ -7289,6 +7295,7 @@ static const value_string usb_products_vals[] = {
     { 0x04ca300b, "Atheros AR3012 Bluetooth" },
     { 0x04ca300d, "Atheros AR3012 Bluetooth" },
     { 0x04ca300f, "Atheros AR3012 Bluetooth" },
+    { 0x04ca3014, "Qualcoom Atheros Bluetooth" },
     { 0x04ca7025, "HP HD Webcam" },
     { 0x04ca7046, "TOSHIBA Web Camera - HD" },
     { 0x04ca9304, "Hub" },
@@ -8227,11 +8234,268 @@ static const value_string usb_products_vals[] = {
     { 0x04f9021b, "DCP-8070D" },
     { 0x04f9021c, "MFC-9320CW" },
     { 0x04f9021d, "MFC-9120CN" },
+    { 0x04f9021e, "DCP-9010CN" },
+    { 0x04f90220, "MFC-9010CN" },
+    { 0x04f90222, "DCP-195C" },
     { 0x04f90223, "DCP-365CN" },
+    { 0x04f90224, "DCP-375CW" },
+    { 0x04f90225, "DCP-395CN" },
+    { 0x04f90227, "DCP-595CN" },
+    { 0x04f90228, "MFC-255CW" },
+    { 0x04f90229, "MFC-295CN" },
+    { 0x04f9022a, "MFC-495CW" },
+    { 0x04f9022b, "MFC-495CN" },
+    { 0x04f9022c, "MFC-795CW" },
+    { 0x04f9022d, "MFC-675CD" },
+    { 0x04f9022e, "MFC-695CDN" },
+    { 0x04f9022f, "MFC-735CD" },
+    { 0x04f90230, "MFC-935CDN" },
+    { 0x04f90234, "DCP-373CW" },
+    { 0x04f90235, "DCP-377CW" },
+    { 0x04f90236, "DCP-390CN" },
+    { 0x04f90239, "MFC-253CW" },
+    { 0x04f9023a, "MFC-257CW" },
+    { 0x04f9023e, "DCP-197C" },
+    { 0x04f9023f, "MFC-8680DN" },
+    { 0x04f90240, "MFC-J950DN" },
     { 0x04f90248, "DCP-7055 scanner/printer" },
+    { 0x04f90253, "DCP-J125" },
+    { 0x04f90254, "DCP-J315W" },
+    { 0x04f90255, "DCP-J515W" },
+    { 0x04f90256, "DCP-J515N" },
+    { 0x04f90257, "DCP-J715W" },
+    { 0x04f90258, "DCP-J715N" },
+    { 0x04f90259, "MFC-J220" },
+    { 0x04f9025a, "MFC-J410" },
+    { 0x04f9025b, "MFC-J265W" },
+    { 0x04f9025c, "MFC-J415W" },
+    { 0x04f9025d, "MFC-J615W" },
+    { 0x04f9025e, "MFC-J615N" },
+    { 0x04f9025f, "MFC-J700D" },
+    { 0x04f90260, "MFC-J800D" },
+    { 0x04f90261, "MFC-J850DN" },
+    { 0x04f9026b, "MFC-J630W" },
+    { 0x04f9026d, "MFC-J805D" },
+    { 0x04f9026e, "MFC-J855DN" },
+    { 0x04f9026f, "MFC-J270W" },
     { 0x04f90273, "DCP-7057 scanner/printer" },
-    { 0x04f9029f, "MFC-9325CW Multifunction Printer" },
-    { 0x04f902b3, "MFC J4510DW" },
+    { 0x04f90276, "MFC-5895CW" },
+    { 0x04f90278, "MFC-J410W" },
+    { 0x04f90279, "DCP-J525W" },
+    { 0x04f9027a, "DCP-J525N" },
+    { 0x04f9027b, "DCP-J725DW" },
+    { 0x04f9027c, "DCP-J725N" },
+    { 0x04f9027d, "DCP-J925DW" },
+    { 0x04f9027e, "MFC-J955DN" },
+    { 0x04f9027f, "MFC-J280W" },
+    { 0x04f90280, "MFC-J435W" },
+    { 0x04f90281, "MFC-J430W" },
+    { 0x04f90282, "MFC-J625DW" },
+    { 0x04f90283, "MFC-J825DW" },
+    { 0x04f90284, "MFC-J825N" },
+    { 0x04f90285, "MFC-J705D" },
+    { 0x04f90287, "MFC-J860DN" },
+    { 0x04f90288, "MFC-J5910DW" },
+    { 0x04f90289, "MFC-J5910CDW" },
+    { 0x04f9028a, "DCP-J925N" },
+    { 0x04f9028d, "MFC-J835DW" },
+    { 0x04f9028f, "MFC-J425W" },
+    { 0x04f90290, "MFC-J432W" },
+    { 0x04f90291, "DCP-8110DN" },
+    { 0x04f90292, "DCP-8150DN" },
+    { 0x04f90293, "DCP-8155DN" },
+    { 0x04f90294, "DCP-8250DN" },
+    { 0x04f90295, "MFC-8510DN" },
+    { 0x04f90296, "MFC-8520DN" },
+    { 0x04f90298, "MFC-8910DW" },
+    { 0x04f90299, "MFC-8950DW" },
+    { 0x04f9029a, "MFC-8690DW" },
+    { 0x04f9029c, "MFC-8515DN" },
+    { 0x04f9029e, "MFC-9125CN" },
+    { 0x04f9029f, "MFC-9325CW" },
+    { 0x04f902a0, "DCP-J140W" },
+    { 0x04f902a5, "MFC-7240" },
+    { 0x04f902a6, "FAX-2940" },
+    { 0x04f902a7, "FAX-2950" },
+    { 0x04f902a8, "MFC-7290" },
+    { 0x04f902ab, "FAX-2990" },
+    { 0x04f902ac, "DCP-8110D" },
+    { 0x04f902ad, "MFC-9130CW" },
+    { 0x04f902ae, "MFC-9140CDN" },
+    { 0x04f902af, "MFC-9330CDW" },
+    { 0x04f902b0, "MFC-9340CDW" },
+    { 0x04f902b1, "DCP-9020CDN" },
+    { 0x04f902b2, "MFC-J810DN" },
+    { 0x04f902b3, "MFC-J4510DW" },
+    { 0x04f902b4, "MFC-J4710DW" },
+    { 0x04f902b5, "DCP-8112DN" },
+    { 0x04f902b6, "DCP-8152DN" },
+    { 0x04f902b7, "DCP-8157DN" },
+    { 0x04f902b8, "MFC-8512DN" },
+    { 0x04f902ba, "MFC-8912DW" },
+    { 0x04f902bb, "MFC-8952DW" },
+    { 0x04f902bc, "DCP-J540N" },
+    { 0x04f902bd, "DCP-J740N" },
+    { 0x04f902be, "MFC-J710D" },
+    { 0x04f902bf, "MFC-J840N" },
+    { 0x04f902c0, "DCP-J940N" },
+    { 0x04f902c1, "MFC-J960DN" },
+    { 0x04f902c2, "DCP-J4110DW" },
+    { 0x04f902c3, "MFC-J4310DW" },
+    { 0x04f902c4, "MFC-J4410DW" },
+    { 0x04f902c5, "MFC-J4610DW" },
+    { 0x04f902c6, "DCP-J4210N" },
+    { 0x04f902c7, "MFC-J4510N" },
+    { 0x04f902c8, "MFC-J4910CDW" },
+    { 0x04f902c9, "MFC-J4810DN" },
+    { 0x04f902ca, "MFC-8712DW" },
+    { 0x04f902cb, "MFC-8710DW" },
+    { 0x04f902cc, "MFC-J2310" },
+    { 0x04f902cd, "MFC-J2510" },
+    { 0x04f902ce, "DCP-7055W" },
+    { 0x04f902cf, "DCP-7057W" },
+    { 0x04f902d0, "DCP-1510" },
+    { 0x04f902d1, "MFC-1810" },
+    { 0x04f902d3, "DCP-9020CDW" },
+    { 0x04f902d4, "MFC-8810DW" },
+    { 0x04f902dd, "DCP-J4215N" },
+    { 0x04f902de, "DCP-J132W" },
+    { 0x04f902df, "DCP-J152W" },
+    { 0x04f902e0, "DCP-J152N" },
+    { 0x04f902e1, "DCP-J172W" },
+    { 0x04f902e2, "DCP-J552DW" },
+    { 0x04f902e3, "DCP-J552N" },
+    { 0x04f902e4, "DCP-J752DW" },
+    { 0x04f902e5, "DCP-J752N" },
+    { 0x04f902e6, "DCP-J952N" },
+    { 0x04f902e7, "MFC-J245" },
+    { 0x04f902e8, "MFC-J470DW" },
+    { 0x04f902e9, "MFC-J475DW" },
+    { 0x04f902ea, "MFC-J285DW" },
+    { 0x04f902eb, "MFC-J650DW" },
+    { 0x04f902ec, "MFC-J870DW" },
+    { 0x04f902ed, "MFC-J870N" },
+    { 0x04f902ee, "MFC-J720D" },
+    { 0x04f902ef, "MFC-J820DN" },
+    { 0x04f902f0, "MFC-J980DN" },
+    { 0x04f902f1, "MFC-J890DN" },
+    { 0x04f902f2, "MFC-J6520DW" },
+    { 0x04f902f3, "MFC-J6570CDW" },
+    { 0x04f902f4, "MFC-J6720DW" },
+    { 0x04f902f5, "MFC-J6920DW" },
+    { 0x04f902f6, "MFC-J6970CDW" },
+    { 0x04f902f7, "MFC-J6975CDW" },
+    { 0x04f902f8, "MFC-J6770CDW" },
+    { 0x04f902f9, "DCP-J132N" },
+    { 0x04f902fa, "MFC-J450DW" },
+    { 0x04f902fb, "MFC-J875DW" },
+    { 0x04f902fc, "DCP-J100" },
+    { 0x04f902fd, "DCP-J105" },
+    { 0x04f902fe, "MFC-J200" },
+    { 0x04f902ff, "MFC-J3520" },
+    { 0x04f90300, "MFC-J3720" },
+    { 0x04f9030f, "DCP-L8400CDN" },
+    { 0x04f90310, "DCP-L8450CDW" },
+    { 0x04f90311, "MFC-L8600CDW" },
+    { 0x04f90312, "MFC-L8650CDW" },
+    { 0x04f90313, "MFC-L8850CDW" },
+    { 0x04f90314, "MFC-L9550CDW" },
+    { 0x04f90318, "MFC-7365DN" },
+    { 0x04f90320, "MFC-L2740DW" },
+    { 0x04f90321, "DCP-L2500D" },
+    { 0x04f90322, "DCP-L2520DW" },
+    { 0x04f90324, "DCP-L2520D" },
+    { 0x04f90326, "DCP-L2540DN" },
+    { 0x04f90328, "DCP-L2540DW" },
+    { 0x04f90329, "DCP-L2560DW" },
+    { 0x04f90330, "HL-L2380DW" },
+    { 0x04f90331, "MFC-L2700DW" },
+    { 0x04f90335, "FAX-L2700DN" },
+    { 0x04f90337, "MFC-L2720DW" },
+    { 0x04f90338, "MFC-L2720DN" },
+    { 0x04f90339, "DCP-J4120DW" },
+    { 0x04f9033a, "MFC-J4320DW" },
+    { 0x04f9033c, "MFC-J2320" },
+    { 0x04f9033d, "MFC-J4420DW" },
+    { 0x04f90340, "MFC-J4620DW" },
+    { 0x04f90341, "MFC-J2720" },
+    { 0x04f90342, "MFC-J4625DW" },
+    { 0x04f90343, "MFC-J5320DW" },
+    { 0x04f90346, "MFC-J5620DW" },
+    { 0x04f90347, "MFC-J5720DW" },
+    { 0x04f90349, "DCP-J4220N" },
+    { 0x04f9034b, "MFC-J4720N" },
+    { 0x04f9034e, "MFC-J5720CDW" },
+    { 0x04f9034f, "MFC-J5820DN" },
+    { 0x04f90350, "MFC-J5620CDW" },
+    { 0x04f90351, "DCP-J137N" },
+    { 0x04f90353, "DCP-J557N" },
+    { 0x04f90354, "DCP-J757N" },
+    { 0x04f90355, "DCP-J957N" },
+    { 0x04f90356, "MFC-J877N" },
+    { 0x04f90357, "MFC-J727D" },
+    { 0x04f90358, "MFC-J987DN" },
+    { 0x04f90359, "MFC-J827DN" },
+    { 0x04f9035a, "MFC-J897DN" },
+    { 0x04f9035b, "DCP-1610W" },
+    { 0x04f9035c, "DCP-1610NW" },
+    { 0x04f9035d, "MFC-1910W" },
+    { 0x04f9035e, "MFC-1910NW" },
+    { 0x04f90361, "MFC-1919NW" },
+    { 0x04f90364, "MFC-J5625DW" },
+    { 0x04f90365, "MFC-J4520DW" },
+    { 0x04f90366, "MFC-J5520DW" },
+    { 0x04f90367, "DCP-7080D" },
+    { 0x04f90368, "DCP-7080" },
+    { 0x04f90369, "DCP-7180DN" },
+    { 0x04f9036a, "DCP-7189DW" },
+    { 0x04f9036b, "MFC-7380" },
+    { 0x04f9036c, "MFC-7480D" },
+    { 0x04f9036d, "MFC-7880DN" },
+    { 0x04f9036e, "MFC-7889DW" },
+    { 0x04f9036f, "DCP-9022CDW" },
+    { 0x04f90370, "MFC-9142CDN" },
+    { 0x04f90371, "MFC-9332CDW" },
+    { 0x04f90372, "MFC-9342CDW" },
+    { 0x04f90373, "MFC-L2700D" },
+    { 0x04f90376, "DCP-1600" },
+    { 0x04f90377, "MFC-1900" },
+    { 0x04f90378, "DCP-1608" },
+    { 0x04f90379, "DCP-1619" },
+    { 0x04f9037a, "MFC-1906" },
+    { 0x04f9037b, "MFC-1908" },
+    { 0x04f9037c, "ADS-2000e" },
+    { 0x04f9037d, "ADS-2100e" },
+    { 0x04f9037e, "ADS-2500We" },
+    { 0x04f9037f, "ADS-2600We" },
+    { 0x04f90380, "DCP-J562DW" },
+    { 0x04f90381, "DCP-J562N" },
+    { 0x04f90383, "DCP-J962N" },
+    { 0x04f90384, "MFC-J480DW" },
+    { 0x04f90385, "MFC-J485DW" },
+    { 0x04f90386, "MFC-J460DW" },
+    { 0x04f90388, "MFC-J680DW" },
+    { 0x04f90389, "MFC-J880DW" },
+    { 0x04f9038a, "MFC-J885DW" },
+    { 0x04f9038b, "MFC-J880N" },
+    { 0x04f9038c, "MFC-J730DN" },
+    { 0x04f9038d, "MFC-J990DN" },
+    { 0x04f9038e, "MFC-J830DN" },
+    { 0x04f9038f, "MFC-J900DN" },
+    { 0x04f90390, "MFC-J5920DW" },
+    { 0x04f90392, "MFC-L2705DW" },
+    { 0x04f90393, "DCP-T300" },
+    { 0x04f90394, "DCP-T500W" },
+    { 0x04f90395, "DCP-T700W" },
+    { 0x04f90396, "MFC-T800W" },
+    { 0x04f90397, "DCP-J963N" },
+    { 0x04f903b3, "MFC-J6925DW" },
+    { 0x04f903b4, "MFC-J6573CDW" },
+    { 0x04f903b5, "MFC-J6973CDW" },
+    { 0x04f903b6, "MFC-J6990CDW" },
+    { 0x04f903bb, "MFC-L2680W" },
+    { 0x04f903bc, "MFC-L2700DN" },
+    { 0x04f903bd, "DCP-J762N" },
     { 0x04f91000, "Printer" },
     { 0x04f91002, "Printer" },
     { 0x04f92002, "PTUSB Printing" },
@@ -8243,6 +8507,14 @@ static const value_string usb_products_vals[] = {
     { 0x04f92027, "QL-560 P-Touch Label Printer" },
     { 0x04f9202b, "PT-7600 P-Touch Label Printer" },
     { 0x04f92100, "Card Reader Writer" },
+    { 0x04f960a0, "ADS-2000" },
+    { 0x04f960a1, "ADS-2100" },
+    { 0x04f960a4, "ADS-2500W" },
+    { 0x04f960a5, "ADS-2600W" },
+    { 0x04f960a6, "ADS-1000W" },
+    { 0x04f960a7, "ADS-1100W" },
+    { 0x04f960a8, "ADS-1500W" },
+    { 0x04f960a9, "ADS-1600W" },
     { 0x04fa2490, "DS1490F 2-in-1 Fob, 1-Wire adapter" },
     { 0x04fa4201, "DS4201 Audio DAC" },
     { 0x04fc0003, "CM1092 / Wintech CM-5098 Optical Mouse" },
@@ -8892,8 +9164,8 @@ static const value_string usb_products_vals[] = {
     { 0x056a0000, "PenPartner" },
     { 0x056a0001, "PenPartner 4x5" },
     { 0x056a0002, "PenPartner 6x8" },
-    { 0x056a0003, "Cintiq Partner" },
-    { 0x056a0010, "Graphire" },
+    { 0x056a0003, "PTU-600 [Cintiq Partner]" },
+    { 0x056a0010, "ET-0405 [Graphire]" },
     { 0x056a0011, "Graphire 2 4x5" },
     { 0x056a0012, "Graphire 2 5x7" },
     { 0x056a0013, "Graphire 3 4x5" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index dd45c6e481..d13d20844e 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2015-09-07)
+(last updated 2015-09-15)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -19862,9 +19862,9 @@ Decimal
     Kevin W. Mullet
       kwm&unt.edu
 4969
-  Park Air Systems
-    Eldar Firing
-      e.firing&no.parkairsystems.com
+  Park Air Systems Ltd.
+    Martin Brunt
+      m.brunt&uk.parkairsystems.com
 4970
   National Grid for Learning
     Nathan Chandler
@@ -185363,6 +185363,46 @@ Decentralization / Helenic Public Administra
   Unitel Engineering
     Vladimir Trushchenko
       v.truschenko&uni-eng.ru
+46446
+  OV Corporation SAS
+    Benjamin ROZIERE
+      benjamin.roziere&rdalambic.com
+46447
+  Embedict 
+    Yiğit YÜCE
+      ygtyce&gmail.com
+46448
+  Telewizja Polsat Spolka z o. o.
+    Marcin Barcikowski
+      mbarcikowski&polsat.com.pl
+46449
+  Collibra
+    Xavier Tesch
+      xavier.tesch&collibra.com
+46450
+  Opsmate, Inc.
+    Hostmaster
+      hostmaster&opsmate.com
+46451
+  InfoRelay Online Systems, Inc
+    Justin Bushey
+      jbushey&inforelay.com
+46452
+  Lanworld Finland Oy
+    Matti-Oskari Leppanen
+      mongrelx&gmail.com
+46453
+  McKesson IWS
+    Vanja Hrbacek
+      vanja.hrbacek&mckesson.com
+46454
+  Goldberg and Mathew Medical Assc P.L.L.C.
+    Renee Goldberg
+      renee.goldberg.phd&gmail.com
+46455
+  Coral Active
+    Kelvin Lynch
+      info&coralactive.com
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index f631fd84ca..52ff81f365 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -4989,7 +4989,7 @@ const value_string sminmpec_values[] = {
     {  4966, "AACom" },
     {  4967, "Starwood Hotels & Resorts" },
     {  4968, "Universtiy of North Texas (unofficial)" },
-    {  4969, "Park Air Systems" },
+    {  4969, "Park Air Systems Ltd." },
     {  4970, "National Grid for Learning" },
     {  4971, "Anglers Club" },
     {  4972, "Los Alamos National LaboratoryGiri" },
@@ -46466,6 +46466,16 @@ const value_string sminmpec_values[] = {
     { 46443, "intec GmbH" },
     { 46444, "Zhejiang Huanshun Network Science & Technology Co., Ltd." },
     { 46445, "Unitel Engineering" },
+    { 46446, "OV Corporation SAS" },
+    { 46447, "Embedict " },
+    { 46448, "Telewizja Polsat Spolka z o. o." },
+    { 46449, "Collibra" },
+    { 46450, "Opsmate, Inc." },
+    { 46451, "InfoRelay Online Systems, Inc" },
+    { 46452, "Lanworld Finland Oy" },
+    { 46453, "McKesson IWS" },
+    { 46454, "Goldberg and Mathew Medical Assc P.L.L.C." },
+    { 46455, "Coral Active" },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index fefb09b9d1..3b8a96e309 100644
--- a/manuf
+++ b/manuf
@@ -1478,7 +1478,7 @@
 00:05:91	ActiveSi               # Active Silicon Ltd
 00:05:92	Pultek                 # Pultek Corp.
 00:05:93	GrammarE               # Grammar Engine Inc.
-00:05:94	IxxatAut               # IXXAT Automation GmbH
+00:05:94	HmsTechn               # HMS Technology Center Ravensburg GmbH
 00:05:95	AlesisCo               # Alesis Corporation
 00:05:96	Genotech               # Genotech Co., Ltd.
 00:05:97	EagleTra               # Eagle Traffic Control Systems
@@ -4045,7 +4045,7 @@
 00:0F:B4	Timespac               # Timespace Technology
 00:0F:B5	NetgearI               # NETGEAR Inc
 00:0F:B6	Europlex               # Europlex Technologies
-00:0F:B7	CaviumNe               # Cavium Networks
+00:0F:B7	Cavium                 # Cavium
 00:0F:B8	Callurl                # CallURL Inc.
 00:0F:B9	Adaptive               # Adaptive Instruments
 00:0F:BA	TeveboxA               # Tevebox AB
@@ -5189,7 +5189,7 @@
 00:14:2C	KonceptI               # Koncept International, Inc.
 00:14:2D	ToradexA               # Toradex AG
 00:14:2E	77Elektr               # 77 Elektronika Kft.
-00:14:2F	Wildpack               # WildPackets
+00:14:2F	Savvis                 # Savvis
 00:14:30	VipowerI               # ViPowER, Inc
 00:14:31	PdlElect               # PDL Electronics Ltd
 00:14:32	Tarallax               # Tarallax Wireless, Inc.
@@ -17964,7 +17964,7 @@
 18:AB:F5	UltraEle               # Ultra Electronics - Electrics
 18:AD:4D	Polostar               # Polostar Technology Corporation
 18:AE:BB	SiemensC               # Siemens Convergence Creators GmbH&Co.KG
-18:AF:61	AInc                   # A, Inc
+18:AF:61	Apple                  # Apple, Inc.
 18:AF:8F	Apple                  # Apple, Inc.
 18:AF:9F	Digitron               # DIGITRONIC Automationsanlagen GmbH
 18:B1:69	Sonicwal               # Sonicwall
@@ -18962,6 +18962,8 @@
 38:91:FB	XenoxBv                # Xenox Holding BV
 38:94:96	SamsungE               # Samsung Elec Co.,Ltd
 38:95:92	BeijingT               # Beijing Tendyron Corporation
+38:97:D6	Hangzhou               # Hangzhou H3C Technologies Co., Limited
+38:98:D8	Meritech               # MERITECH CO.,LTD
 38:9F:83	OtnNV                  # OTN Systems N.V.
 38:A5:3C	Veenstra               # Veenstra Instruments
 38:A5:B6	Shenzhen               # SHENZHEN MEGMEET ELECTRICAL CO.,LTD
@@ -20643,7 +20645,7 @@
 5C:F6:DC	SamsungE               # Samsung Electronics Co.,LTD
 5C:F7:C3	SyntechH               # SYNTECH (HK) TECHNOLOGY LIMITED
 5C:F8:A1	MurataMa               # Murata Manufacturing Co., Ltd.
-5C:F9:38	AInc                   # A, Inc
+5C:F9:38	Apple                  # Apple, Inc.
 5C:F9:6A	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 5C:F9:DD	DellInc                # Dell Inc
 5C:F9:F0	AtomosEn               # Atomos Engineering P/L
@@ -20698,7 +20700,7 @@
 60:63:FD	Transcen               # Transcend Communication Beijing Co.,Ltd.
 60:64:A1	Radiflow               # RADiflow Ltd.
 60:67:20	IntelCor               # Intel Corporate
-60:69:44	AInc                   # A, Inc
+60:69:44	Apple                  # Apple, Inc.
 60:69:9B	IseposGm               # isepos GmbH
 60:6B:BD	SamsungE               # Samsung Electronics Co., LTD
 60:6C:66	IntelCor               # Intel Corporate
@@ -21169,7 +21171,7 @@
 6C:DC:6A	Promethe               # Promethean Limited
 6C:E0:1E	ModcamAb               # Modcam AB
 6C:E0:B0	Sound4                 # SOUND4
-6C:E3:B6	NeraTele               # Nera Telecommunciations Ltd
+6C:E3:B6	NeraTele               # Nera Telecommunications Ltd.
 6C:E4:CE	Villiger               # Villiger Security Solutions AG
 6C:E8:73	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 6C:E9:07	NokiaCor               # Nokia Corporation
@@ -21294,6 +21296,7 @@
 70:B1:4E	PacePlc                # Pace plc
 70:B2:65	HiltronS               # Hiltron s.r.l.
 70:B3:D5	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see OUI36 public listing for more information.
+70:B3:D5:00:10:00/36	SorediTo               # SOREDI touch systems GmbH
 70:B3:D5:00:E0:00/36	MagosysL               # Magosys Systems LTD
 70:B3:D5:01:00:00/36	HanwaEle               # Hanwa Electronic Ind.Co.,Ltd.
 70:B3:D5:01:60:00/36	Guardian               # Guardian Controls International Ltd
@@ -21375,6 +21378,7 @@
 70:B3:D5:16:10:00/36	MbConnec               # MB Connect Line GmbH
 70:B3:D5:16:40:00/36	TokyoDra               # Tokyo Drawing Ltd.
 70:B3:D5:16:60:00/36	SerialIm               # SERIAL IMAGE INC.
+70:B3:D5:16:E0:00/36	JemacSwe               # Jemac Sweden AB
 70:B3:D5:17:20:00/36	Lumigrow               # LumiGrow, Inc
 70:B3:D5:17:F0:00/36	MbConnec               # MB Connect Line GmbH
 70:B3:D5:18:10:00/36	TaskSist               # Task Sistemas
@@ -21424,6 +21428,7 @@
 70:B3:D5:29:D0:00/36	Xtech2Si               # XTech2 SIA
 70:B3:D5:2A:50:00/36	Taitotek               # Taitotekniikka
 70:B3:D5:2A:70:00/36	Plasmabi               # Plasmability, LLC
+70:B3:D5:2B:30:00/36	Has                    # HAS co.,ltd.
 70:B3:D5:2B:C0:00/36	EquiposD               # EQUIPOS DE TELECOMUNICACIÓN OPTOELECTRÓNICOS, S.A.
 70:B3:D5:2B:E0:00/36	Coherent               # Coherent Logix, Inc.
 70:B3:D5:2C:E0:00/36	Kdt                    # KDT
@@ -21768,6 +21773,7 @@
 70:B3:D5:93:50:00/36	SensorDe               # Sensor Developments
 70:B3:D5:93:60:00/36	FaroTech               # FARO TECHNOLOGIES, INC.
 70:B3:D5:94:10:00/36	TriaxA/S               # Triax A/S
+70:B3:D5:94:30:00/36	AbbottMe               # Abbott Medical Optics Inc.
 70:B3:D5:95:60:00/36	Aerovisi               # AeroVision Avionics, Inc.
 70:B3:D5:95:70:00/36	EaElektr               # EA Elektroautomatik GmbH & Co. KG
 70:B3:D5:95:80:00/36	Purelifi               # pureLiFi Ltd
@@ -21844,6 +21850,7 @@
 70:B3:D5:AD:60:00/36	Lemonade               # Lemonade Lab Inc
 70:B3:D5:AD:A0:00/36	Private                # Private
 70:B3:D5:AD:D0:00/36	GhlBerha               # GHL Systems Berhad
+70:B3:D5:AE:00:00/36	Anycomm                # AnyComm.Co.,Ltd.
 70:B3:D5:AE:20:00/36	TransasM               # Transas Marine International
 70:B3:D5:AE:30:00/36	Zhejiang               # Zhejiang Wellsun Electric Meter Co.,Ltd
 70:B3:D5:AE:90:00/36	CariElec               # Cari Electronic
@@ -21886,6 +21893,7 @@
 70:B3:D5:BA:D0:00/36	TechnikD               # Technik & Design GmbH
 70:B3:D5:BA:E0:00/36	Warecube               # WARECUBE,INC
 70:B3:D5:BB:20:00/36	MettlerT               # Mettler Toledo Hi-Speed
+70:B3:D5:BB:80:00/36	AlKamelS               # Al Kamel Systems S.L.
 70:B3:D5:BB:D0:00/36	Providiu               # Providius Corp
 70:B3:D5:BB:E0:00/36	SunriseE               # Sunrise Systems Electronics Co. Inc.
 70:B3:D5:BC:60:00/36	Hattelan               # Hatteland Display AS
@@ -21899,6 +21907,7 @@
 70:B3:D5:BE:D0:00/36	Itrinegy               # Itrinegy Ltd.
 70:B3:D5:BE:F0:00/36	Sensorte               # Sensortech Systems Inc.
 70:B3:D5:BF:10:00/36	Flashnet               # Flashnet SRL
+70:B3:D5:BF:20:00/36	TwinDeve               # TWIN DEVELOPMENT
 70:B3:D5:C0:10:00/36	Smartgua               # SmartGuard LLC
 70:B3:D5:C0:30:00/36	XaviTech               # XAVi Technologies Corp.
 70:B3:D5:C0:70:00/36	Areco                  # ARECO
@@ -21976,8 +21985,10 @@
 70:B3:D5:D5:A0:00/36	Wyrestor               # WyreStorm Technologies Ltd
 70:B3:D5:D5:B0:00/36	Wyrestor               # WyreStorm Technologies Ltd
 70:B3:D5:D6:10:00/36	Vitec                  # VITEC
+70:B3:D5:D7:00:00/36	Rational               # Rational Production srl Unipersonale
 70:B3:D5:D7:30:00/36	ErmineCo               # ERMINE Corporation
 70:B3:D5:D7:40:00/36	SandiaNa               # Sandia National Laboratories
+70:B3:D5:D7:60:00/36	Attocube               # attocube systems AG
 70:B3:D5:D7:90:00/36	GomaElet               # GOMA ELETTRONICA SpA
 70:B3:D5:D7:A0:00/36	Speedifi               # Speedifi Inc
 70:B3:D5:D7:E0:00/36	TriaxA/S               # Triax A/S
@@ -22252,6 +22263,7 @@
 74:A4:B5	Powerlea               # Powerleader Science and Technology Co. Ltd.
 74:A7:22	LgElectr               # LG Electronics
 74:A7:8E	ZteCorpo               # zte corporation
+74:AC:5F	QikuInte               # Qiku Internet Network Scientific (Shenzhen) Co., Ltd.
 74:AD:B7	ChinaMob               # China Mobile Group Device Co.,Ltd.
 74:AE:76	InovoBro               # iNovo Broadband, Inc.
 74:B0:0C	NetworkV               # Network Video Technologies, Inc
@@ -22448,6 +22460,7 @@
 78:F5:FD	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 78:F7:BE	SamsungE               # Samsung Electronics Co.,Ltd
 78:F7:D0	Silverbr               # Silverbrook Research
+78:F8:82	LgElectr               # LG Electronics (Mobile Communications)
 78:F9:44	Private                # Private
 78:FC:14	BCommuni               # B Communications Pty Ltd
 78:FD:94	Apple                  # Apple, Inc.
@@ -22472,6 +22485,7 @@
 7C:11:CD	Qiantang               # QianTang Technology
 7C:14:76	DamallTe               # Damall Technologies SAS
 7C:16:0D	Saia-Bur               # Saia-Burgess Controls AG
+7C:18:CD	E-Tron                 # E-TRON Co.,Ltd.
 7C:1A:03	8locatio               # 8Locations Co., Ltd.
 7C:1A:FC	DalianCo               # Dalian Co-Edifice Video Technology Co., Ltd
 7C:1D:D9	XiaomiCo               # Xiaomi Communications Co Ltd
@@ -23322,6 +23336,7 @@
 94:7C:3E	Polewall               # Polewall Norge AS
 94:81:A4	AzurayTe               # Azuray Technologies
 94:85:7A	Evantage               # Evantage Industries Corp
+94:86:CD	SeoulEle               # SEOUL ELECTRONICS&TELECOM
 94:86:D4	Surveill               # Surveillance Pro Corporation
 94:87:7C	ArrisGro               # ARRIS Group, Inc.
 94:88:54	TexasIns               # Texas Instruments
@@ -23340,6 +23355,7 @@
 94:A7:B7	ZteCorpo               # zte corporation
 94:A7:BC	Bodymedi               # BodyMedia, Inc.
 94:AA:B8	JoviewBe               # Joview(Beijing) Technology Co. Ltd.
+94:AB:DE	OmxTechn               # OMX Technology - FZE
 94:AC:CA	TrivumTe               # trivum technologies GmbH
 94:AE:61	AlcatelL               # Alcatel Lucent
 94:AE:E3	BeldenHi               # Belden Hirschmann Industries (Suzhou) Ltd.
@@ -23617,6 +23633,7 @@
 9C:D6:43	D-LinkIn               # D-Link International
 9C:D9:17	Motorola               # Motorola Mobility LLC
 9C:DF:03	Harman/B               # Harman/Becker Automotive Systems GmbH
+9C:DF:B1	Shenzhen               # Shenzhen Crave Communication Co., LTD
 9C:E1:0E	NctechLt               # NCTech Ltd
 9C:E1:D6	JungerAu               # Junger Audio-Studiotechnik GmbH
 9C:E2:30	Julong                 # JULONG CO,.LTD.
@@ -23624,6 +23641,7 @@
 9C:E6:E7	SamsungE               # Samsung Electronics Co.,Ltd
 9C:E7:BD	Windusko               # Winduskorea co., Ltd
 9C:EB:E8	BizlinkK               # BizLink (Kunshan) Co.,Ltd
+9C:EF:D5	PandaWir               # Panda Wireless, Inc.
 9C:F3:87	Apple                  # Apple, Inc.
 9C:F6:1A	UtcFireA               # UTC Fire and Security
 9C:F6:7D	RicardoP               # Ricardo Prague, s.r.o.
@@ -24990,6 +25008,7 @@ C8:3F:B4	ArrisGro               # ARRIS Group, Inc.
 C8:45:29	ImkNetwo               # IMK Networks Co.,Ltd
 C8:45:44	Shanghai               # Shanghai Enlogic Electric Technology Co., Ltd.
 C8:45:8F	WylerAg                # Wyler AG
+C8:47:8C	BekenCor               # Beken Corporation
 C8:48:F5	MedisonX               # MEDISON Xray Co., Ltd
 C8:4C:75	CiscoInc               # Cisco Systems, Inc
 C8:51:95	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
@@ -24997,6 +25016,8 @@ C8:56:45	Intermas               # Intermas France
 C8:56:63	SunflexE               # Sunflex Europe GmbH
 C8:60:00	AsustekC               # ASUSTek COMPUTER INC.
 C8:64:C7	ZteCorpo               # zte corporation
+C8:66:5D	Aerohive               # Aerohive Networks Inc.
+C8:67:5E	Aerohive               # Aerohive Networks Inc.
 C8:69:CD	Apple                  # Apple, Inc.
 C8:6C:1E	DisplayL               # Display Systems Ltd
 C8:6C:87	ZyxelCom               # ZyXEL Communications Corporation
@@ -25970,7 +25991,7 @@ E4:95:6E	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM
 E4:96:AE	Altograp               # ALTOGRAPHICS Inc.
 E4:97:F0	Shanghai               # Shanghai VLC Technologies Ltd. Co.
 E4:98:D1	Microsof               # Microsoft Mobile Oy
-E4:98:D6	AInc                   # A, Inc
+E4:98:D6	Apple                  # Apple, Inc.
 E4:A3:2F	Shanghai               # Shanghai Artimen Technology Co., Ltd.
 E4:A3:87	ControlS               # Control Solutions LLC
 E4:A5:EF	TronLink               # TRON LINK ELECTRONICS CO., LTD.
@@ -26197,7 +26218,7 @@ EC:55:F9	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 EC:59:E7	Microsof               # Microsoft Corporation
 EC:5A:86	YulongCo               # Yulong Computer Telecommunication Scientific (Shenzhen) Co.,Ltd
 EC:5C:69	Mitsubis               # MITSUBISHI HEAVY INDUSTRIES MECHATRONICS SYSTEMS,LTD.
-EC:5F:23	Kimascen               # Kimascend Electronics and Technology Ltd.
+EC:5F:23	QinghaiK               # Qinghai Kimascend Electronics Technology Co. Ltd.
 EC:60:E0	Avi-OnLa               # AVI-ON LABS
 EC:62:64	Global41               # Global411 Internet Services, LLC
 EC:63:E5	EpboardD               # ePBoard Design LLC
diff --git a/services b/services
index 64f2c73095..8a576edc8a 100644
--- a/services
+++ b/services
@@ -7927,6 +7927,8 @@ netcabinet-com   4409/tcp # Net-Cabinet comunication [Ian_Manning_2] [Ian_Mannin
 itwo-server      4410/tcp # RIB iTWO Application Server [Kristean_Heisler_2] [Kristean_Heisler_2] 2009-12-16
 found            4411/tcp # Found Messaging Protocol [Found_Software] [John_Mitchell] 2012-04-11 Defined TXT keys: id, key
 smallchat        4412/udp # SmallChat [Valentino_Giudice] [Valentino_Giudice] 2015-08-18
+avi-nms          4413/tcp # AVI Systems NMS [AVI_Systems] [Dave_Hatz] 2015-09-18
+avi-nms-disc     4413/udp # AVI Systems NMS [AVI_Systems] [Dave_Hatz] 2015-09-18
 netrockey6       4425/tcp # NetROCKEY6 SMART Plus Service [Feitian_Technologies] [Feitian_Technologies] 2010-09-15
 netrockey6       4425/udp # NetROCKEY6 SMART Plus Service [Feitian_Technologies] [Feitian_Technologies] 2010-09-15
 beacon-port-2    4426/tcp # SMARTS Beacon Port [Eyal_Yardeni] [Eyal_Yardeni] 2003-11