diff --git a/TODO b/TODO
index 0e04396a9d..4dd0271b64 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,10 @@ Janitorial Clean-ups:
 
 Features:
 
+* sort generated hwdb files alphabetically when we import them, so that git
+  diffs remain minimal (in particular: the OUI databases we import are not
+  sorted, and not stable)
+
 * set SystemCallArchitectures=native on all our services
 
 * maybe add call sd_journal_set_block_timeout() or so to set SO_SNDTIMEO for
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
index f638b0dc34..2f0dbc9e74 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -1103,21 +1103,21 @@ OUI:70B3D58EC*
 OUI:70B3D5CF5*
  ID_OUI_FROM_DATABASE=Petring Energietechnik GmbH
 
-OUI:70B3D5269*
- ID_OUI_FROM_DATABASE=Gilbarco Veeder-Root  ‎
-
 OUI:70B3D5FF7*
  ID_OUI_FROM_DATABASE=Cybercom AB
 
 OUI:70B3D5DCC*
  ID_OUI_FROM_DATABASE=Eutron SPA
 
-OUI:70B3D515C*
- ID_OUI_FROM_DATABASE=Woods Hole Oceanographic Institution
+OUI:70B3D5269*
+ ID_OUI_FROM_DATABASE=Gilbarco Veeder-Root  ‎
 
 OUI:70B3D5173*
  ID_OUI_FROM_DATABASE=National TeleConsultants LLC
 
+OUI:70B3D515C*
+ ID_OUI_FROM_DATABASE=Woods Hole Oceanographic Institution
+
 OUI:70B3D5CAE*
  ID_OUI_FROM_DATABASE=THEMA
 
@@ -1133,12 +1133,12 @@ OUI:70B3D585A*
 OUI:70B3D5FAF*
  ID_OUI_FROM_DATABASE=Radig Hard & Software
 
-OUI:70B3D50BC*
- ID_OUI_FROM_DATABASE=Practical Software Studio LLC
-
 OUI:70B3D57A2*
  ID_OUI_FROM_DATABASE=Alpha ESS Co., Ltd.
 
+OUI:70B3D50BC*
+ ID_OUI_FROM_DATABASE=Practical Software Studio LLC
+
 OUI:70B3D5724*
  ID_OUI_FROM_DATABASE=Quan International Co., Ltd.
 
@@ -1196,6 +1196,15 @@ OUI:70B3D590D*
 OUI:70B3D5C60*
  ID_OUI_FROM_DATABASE=Gogo BA
 
+OUI:70B3D5A73*
+ ID_OUI_FROM_DATABASE=MobiPromo
+
+OUI:70B3D5585*
+ ID_OUI_FROM_DATABASE=Nefteavtomatika
+
+OUI:70B3D5495*
+ ID_OUI_FROM_DATABASE=Fiem Industries Ltd.
+
 OUI:70B3D5D60*
  ID_OUI_FROM_DATABASE=Flintab AB
 
@@ -2267,12 +2276,12 @@ OUI:70B3D521D*
 OUI:70B3D5E9C*
  ID_OUI_FROM_DATABASE=ATG UV Technology
 
-OUI:70B3D5267*
- ID_OUI_FROM_DATABASE=Zehntner Testing Instruments
-
 OUI:70B3D539E*
  ID_OUI_FROM_DATABASE=Lanmark Controls Inc.
 
+OUI:70B3D5267*
+ ID_OUI_FROM_DATABASE=Zehntner Testing Instruments
+
 OUI:70B3D5C2E*
  ID_OUI_FROM_DATABASE=Triax A/S
 
@@ -2315,12 +2324,12 @@ OUI:70B3D5DFD*
 OUI:70B3D5B30*
  ID_OUI_FROM_DATABASE=Systolé Hardware B.V.
 
-OUI:70B3D5745*
- ID_OUI_FROM_DATABASE=TMSI LLC
-
 OUI:70B3D53BF*
  ID_OUI_FROM_DATABASE=Star Electronics GmbH & Co. KG
 
+OUI:70B3D5745*
+ ID_OUI_FROM_DATABASE=TMSI LLC
+
 OUI:70B3D5D1C*
  ID_OUI_FROM_DATABASE=Specialised Imaging Limited
 
@@ -2333,12 +2342,12 @@ OUI:70B3D5ADF*
 OUI:70B3D522C*
  ID_OUI_FROM_DATABASE=Hiquel Elektronik- und Anlagenbau GmbH
 
-OUI:70B3D52A2*
- ID_OUI_FROM_DATABASE=Visualware, Inc.
-
 OUI:70B3D5DCE*
  ID_OUI_FROM_DATABASE=Stahl GmbH
 
+OUI:70B3D52A2*
+ ID_OUI_FROM_DATABASE=Visualware, Inc.
+
 OUI:70B3D5D08*
  ID_OUI_FROM_DATABASE=Veeco Instruments
 
@@ -2360,6 +2369,15 @@ OUI:70B3D5AF6*
 OUI:70B3D5F37*
  ID_OUI_FROM_DATABASE=Mitsubishi Electric Micro-Computer Application Software Co.,Ltd.
 
+OUI:70B3D58C3*
+ ID_OUI_FROM_DATABASE=Wyebot, Inc.
+
+OUI:70B3D542D*
+ ID_OUI_FROM_DATABASE=RCH Italia SpA
+
+OUI:70B3D5332*
+ ID_OUI_FROM_DATABASE=InnoSenT
+
 OUI:70B3D5494*
  ID_OUI_FROM_DATABASE=Schildknecht AG
 
@@ -3413,15 +3431,15 @@ OUI:70B3D516F*
 OUI:70B3D59C0*
  ID_OUI_FROM_DATABASE=Schneider Displaytechnik GmbH
 
-OUI:70B3D5149*
- ID_OUI_FROM_DATABASE=eleven-x
-
 OUI:70B3D5E98*
  ID_OUI_FROM_DATABASE=JSC Kaluga Astral
 
 OUI:70B3D5443*
  ID_OUI_FROM_DATABASE=Slot3 GmbH
 
+OUI:70B3D5149*
+ ID_OUI_FROM_DATABASE=eleven-x
+
 OUI:70B3D5952*
  ID_OUI_FROM_DATABASE=REQUEA
 
@@ -3434,12 +3452,12 @@ OUI:70B3D5C5C*
 OUI:70B3D5F3B*
  ID_OUI_FROM_DATABASE=Epdm Pty Ltd
 
-OUI:70B3D59F6*
- ID_OUI_FROM_DATABASE=Edgeware AB
-
 OUI:70B3D536F*
  ID_OUI_FROM_DATABASE=BuddyGuard GmbH
 
+OUI:70B3D59F6*
+ ID_OUI_FROM_DATABASE=Edgeware AB
+
 OUI:70B3D5222*
  ID_OUI_FROM_DATABASE=Marioff Corporation Oy
 
@@ -3500,6 +3518,21 @@ OUI:70B3D5572*
 OUI:70B3D5927*
  ID_OUI_FROM_DATABASE=LG Electronics
 
+OUI:70B3D5489*
+ ID_OUI_FROM_DATABASE=ard sa
+
+OUI:70B3D52B1*
+ ID_OUI_FROM_DATABASE=WIXCON Co., Ltd
+
+OUI:70B3D5B6A*
+ ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
+
+OUI:70B3D5579*
+ ID_OUI_FROM_DATABASE=Chelsea Technologies Group Ltd
+
+OUI:70B3D59B2*
+ ID_OUI_FROM_DATABASE=CONTINENT, Ltd
+
 OUI:70B3D566B*
  ID_OUI_FROM_DATABASE=Innitive B.V.
 
@@ -4526,12 +4559,12 @@ OUI:70B3D590B*
 OUI:70B3D5C4B*
  ID_OUI_FROM_DATABASE=ANKER-EAST
 
-OUI:70B3D568E*
- ID_OUI_FROM_DATABASE=CEA Technologies Pty Ltd
-
 OUI:70B3D5542*
  ID_OUI_FROM_DATABASE=RTDS Technologies Inc.
 
+OUI:70B3D568E*
+ ID_OUI_FROM_DATABASE=CEA Technologies Pty Ltd
+
 OUI:70B3D51E4*
  ID_OUI_FROM_DATABASE=Tecnologix s.r.l.
 
@@ -4556,15 +4589,15 @@ OUI:70B3D5FBF*
 OUI:70B3D5825*
  ID_OUI_FROM_DATABASE=TATTILE SRL
 
-OUI:70B3D5D37*
- ID_OUI_FROM_DATABASE=Sicon srl
-
 OUI:70B3D5039*
  ID_OUI_FROM_DATABASE=DoWoo Digitech
 
 OUI:70B3D527E*
  ID_OUI_FROM_DATABASE=Mettler Toledo Hi Speed
 
+OUI:70B3D5D37*
+ ID_OUI_FROM_DATABASE=Sicon srl
+
 OUI:70B3D5F83*
  ID_OUI_FROM_DATABASE=Tata Communications Ltd.
 
@@ -4577,33 +4610,33 @@ OUI:70B3D50D9*
 OUI:70B3D537C*
  ID_OUI_FROM_DATABASE=Merus Power Dynamics Ltd.
 
-OUI:70B3D5EF8*
- ID_OUI_FROM_DATABASE=DKS Dienstl.ges. f. Komm.anl. d. Stadt- u. Reg.verk. mbH
-
 OUI:70B3D54CF*
  ID_OUI_FROM_DATABASE=GREEN HOUSE CO., LTD.
 
+OUI:70B3D5EF8*
+ ID_OUI_FROM_DATABASE=DKS Dienstl.ges. f. Komm.anl. d. Stadt- u. Reg.verk. mbH
+
 OUI:70B3D5D58*
  ID_OUI_FROM_DATABASE=Idyllic Engineering Pte Ltd
 
 OUI:70B3D5954*
  ID_OUI_FROM_DATABASE=Dot System S.r.l.
 
-OUI:70B3D5D40*
- ID_OUI_FROM_DATABASE=CRDE
-
 OUI:70B3D5880*
  ID_OUI_FROM_DATABASE=Skopei B.V.
 
+OUI:70B3D5D40*
+ ID_OUI_FROM_DATABASE=CRDE
+
 OUI:70B3D551C*
  ID_OUI_FROM_DATABASE=ATX Networks Corp
 
-OUI:70B3D5FBD*
- ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
-
 OUI:70B3D5511*
  ID_OUI_FROM_DATABASE=Next Sight srl
 
+OUI:70B3D5FBD*
+ ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
+
 OUI:70B3D5FA7*
  ID_OUI_FROM_DATABASE=Nordson Corporation
 
@@ -4622,12 +4655,12 @@ OUI:70B3D5902*
 OUI:70B3D5AD1*
  ID_OUI_FROM_DATABASE=Sensile Technologies SA
 
-OUI:70B3D5397*
- ID_OUI_FROM_DATABASE=Guangxi Hunter Information Industry Co.,Ltd
-
 OUI:70B3D5637*
  ID_OUI_FROM_DATABASE=INEO-SENSE
 
+OUI:70B3D5397*
+ ID_OUI_FROM_DATABASE=Guangxi Hunter Information Industry Co.,Ltd
+
 OUI:70B3D5378*
  ID_OUI_FROM_DATABASE=synchrotron SOLEIL
 
@@ -4661,11 +4694,23 @@ OUI:70B3D5022*
 OUI:70B3D5135*
  ID_OUI_FROM_DATABASE=DORLET SAU
 
+OUI:70B3D5FF1*
+ ID_OUI_FROM_DATABASE=Data Strategy Limited
+
 OUI:70B3D5002*
  ID_OUI_FROM_DATABASE=Gogo BA
 
-OUI:70B3D5FF1*
- ID_OUI_FROM_DATABASE=Data Strategy Limited
+OUI:70B3D50B0*
+ ID_OUI_FROM_DATABASE=Raven Systems Design, Inc
+
+OUI:70B3D5596*
+ ID_OUI_FROM_DATABASE=Mencom Corporation
+
+OUI:70B3D5138*
+ ID_OUI_FROM_DATABASE=SMITEC S.p.A.
+
+OUI:70B3D517A*
+ ID_OUI_FROM_DATABASE=Gencoa Ltd
 
 OUI:70B3D58AB*
  ID_OUI_FROM_DATABASE=EMAC, Inc.
@@ -5681,12 +5726,12 @@ OUI:70B3D520D*
 OUI:70B3D5D55*
  ID_OUI_FROM_DATABASE=WM Design s.r.o
 
-OUI:70B3D5E67*
- ID_OUI_FROM_DATABASE=APPLIED PROCESSING
-
 OUI:70B3D5523*
  ID_OUI_FROM_DATABASE=Tibit Communications
 
+OUI:70B3D5E67*
+ ID_OUI_FROM_DATABASE=APPLIED PROCESSING
+
 OUI:70B3D5241*
  ID_OUI_FROM_DATABASE=Bolide Technology Group, Inc.
 
@@ -5717,15 +5762,15 @@ OUI:70B3D5A05*
 OUI:70B3D5AA6*
  ID_OUI_FROM_DATABASE=Proximus
 
-OUI:70B3D51D4*
- ID_OUI_FROM_DATABASE=Brinkmann Audio GmbH
-
 OUI:70B3D55E5*
  ID_OUI_FROM_DATABASE=HAIYANG OLIX CO.,LTD.
 
 OUI:70B3D5E2C*
  ID_OUI_FROM_DATABASE=Fourth Frontier Technologies Private Limited
 
+OUI:70B3D51D4*
+ ID_OUI_FROM_DATABASE=Brinkmann Audio GmbH
+
 OUI:70B3D55CA*
  ID_OUI_FROM_DATABASE=ACD Elekronik GmbH
 
@@ -5759,12 +5804,12 @@ OUI:70B3D5EC8*
 OUI:70B3D53F0*
  ID_OUI_FROM_DATABASE=Intervala
 
-OUI:70B3D5BD1*
- ID_OUI_FROM_DATABASE=CableLabs
-
 OUI:70B3D5B1A*
  ID_OUI_FROM_DATABASE=Aaronia AG
 
+OUI:70B3D5BD1*
+ ID_OUI_FROM_DATABASE=CableLabs
+
 OUI:70B3D5F0D*
  ID_OUI_FROM_DATABASE=MeQ Inc.
 
@@ -5795,6 +5840,18 @@ OUI:70B3D52C2*
 OUI:70B3D5BF3*
  ID_OUI_FROM_DATABASE=CG-WIRELESS
 
+OUI:70B3D59A1*
+ ID_OUI_FROM_DATABASE=ITS Industrial Turbine Services GmbH
+
+OUI:70B3D5861*
+ ID_OUI_FROM_DATABASE=KST technology
+
+OUI:70B3D5442*
+ ID_OUI_FROM_DATABASE=Blair Companies
+
+OUI:70B3D5C74*
+ ID_OUI_FROM_DATABASE=Qtechnology A/S
+
 OUI:1C8776D*
  ID_OUI_FROM_DATABASE=Qivivo
 
@@ -6554,12 +6611,12 @@ OUI:40F3854*
 OUI:40F3859*
  ID_OUI_FROM_DATABASE=Fast Precision Technologies Co. Ltd.
 
-OUI:40F3850*
- ID_OUI_FROM_DATABASE=SubPac
-
 OUI:1CA0D32*
  ID_OUI_FROM_DATABASE=NovTech, Inc.
 
+OUI:40F3850*
+ ID_OUI_FROM_DATABASE=SubPac
+
 OUI:38FDFEC*
  ID_OUI_FROM_DATABASE=New Garden Co., Ltd.
 
@@ -6599,12 +6656,12 @@ OUI:98AAFC8*
 OUI:98AAFCC*
  ID_OUI_FROM_DATABASE=dots Inc.
 
-OUI:08ED023*
- ID_OUI_FROM_DATABASE=Jiangsu Logread Network Technology Co., LTD.
-
 OUI:08ED026*
  ID_OUI_FROM_DATABASE=SANGO ELECTRONICS CO
 
+OUI:08ED023*
+ ID_OUI_FROM_DATABASE=Jiangsu Logread Network Technology Co., LTD.
+
 OUI:08ED024*
  ID_OUI_FROM_DATABASE=Fio Corporation
 
@@ -6623,6 +6680,21 @@ OUI:60D7E30*
 OUI:F023B98*
  ID_OUI_FROM_DATABASE=G3 TECHNOLOGIES< INC
 
+OUI:F023B9E*
+ ID_OUI_FROM_DATABASE=Domotz Ltd
+
+OUI:F023B92*
+ ID_OUI_FROM_DATABASE=Raysgem Electronics and Technology Co.Ltd
+
+OUI:F023B95*
+ ID_OUI_FROM_DATABASE=Audeara Pty. Ltd.
+
+OUI:8C147DC*
+ ID_OUI_FROM_DATABASE=Reynaers Aluminium
+
+OUI:8C147D0*
+ ID_OUI_FROM_DATABASE=Nio
+
 OUI:1C8776C*
  ID_OUI_FROM_DATABASE=Strone Technology
 
@@ -7400,15 +7472,15 @@ OUI:40F3855*
 OUI:1CA0D35*
  ID_OUI_FROM_DATABASE=Dynamic Connect (Suzhou) Hi-Tech Electronic Co.,Ltd.
 
+OUI:1CA0D33*
+ ID_OUI_FROM_DATABASE=SAVELEC
+
 OUI:1CA0D37*
  ID_OUI_FROM_DATABASE=Private
 
 OUI:A411634*
  ID_OUI_FROM_DATABASE=AlterG, Inc.
 
-OUI:1CA0D33*
- ID_OUI_FROM_DATABASE=SAVELEC
-
 OUI:A411631*
  ID_OUI_FROM_DATABASE=INTER CONTROL Hermann Köhler Elektrik GmbH & Co.KG
 
@@ -7454,6 +7526,18 @@ OUI:04714B2*
 OUI:04714B8*
  ID_OUI_FROM_DATABASE=Energport Inc
 
+OUI:8C147D5*
+ ID_OUI_FROM_DATABASE=Unwired Networks
+
+OUI:F023B94*
+ ID_OUI_FROM_DATABASE=EZVIS LIMITED
+
+OUI:F023B9A*
+ ID_OUI_FROM_DATABASE=annapurnalabs
+
+OUI:8C147D2*
+ ID_OUI_FROM_DATABASE=Agilent S.p.A
+
 OUI:1C87765*
  ID_OUI_FROM_DATABASE=Zhuhai MYZR Technology Co.,Ltd
 
@@ -9245,6 +9329,15 @@ OUI:F023B9D*
 OUI:F023B96*
  ID_OUI_FROM_DATABASE=Xiamen Jinhaode Electronic Co.,Ltd
 
+OUI:F023B9C*
+ ID_OUI_FROM_DATABASE=Shenzhen Lachesis Mhealth Co., Ltd.
+
+OUI:8C147DA*
+ ID_OUI_FROM_DATABASE=Bluemega Document & Print Services
+
+OUI:8C147D1*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:1C87740*
  ID_OUI_FROM_DATABASE=Philips Personal Health Solutions
 
@@ -10034,6 +10127,18 @@ OUI:04714BA*
 OUI:F023B97*
  ID_OUI_FROM_DATABASE=Transcend Building Automation control network corporation
 
+OUI:F023B93*
+ ID_OUI_FROM_DATABASE=BSP RUS Ltd.
+
+OUI:8C147DD*
+ ID_OUI_FROM_DATABASE=Shenzhen  Lanxus  technology Co. Ltd.
+
+OUI:8C147D3*
+ ID_OUI_FROM_DATABASE=Remotec Technology Limited
+
+OUI:8C147D4*
+ ID_OUI_FROM_DATABASE=Nanjing bilian information Technology Co.,Ltd.
+
 OUI:E043DB*
  ID_OUI_FROM_DATABASE=Shenzhen ViewAt Technology Co.,Ltd.
 
@@ -10535,30 +10640,6 @@ OUI:781DBA*
 OUI:001E10*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
-OUI:B0ADAA*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:10CDAE*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:50CD22*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:FCA841*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:3CB15B*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:C8F406*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:2CF4C5*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:7038EE*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:88F031*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -22577,9 +22658,6 @@ OUI:00B0B3*
 OUI:14825B*
  ID_OUI_FROM_DATABASE=Hefei Radio Communication Technology Co., Ltd
 
-OUI:00549F*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:00562B*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -23384,9 +23462,6 @@ OUI:A49B13*
 OUI:542F8A*
  ID_OUI_FROM_DATABASE=TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO
 
-OUI:6049C1*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:DCC64B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -23891,6 +23966,51 @@ OUI:30C3D9*
 OUI:FC4D8C*
  ID_OUI_FROM_DATABASE=SHENZHEN PANTE ELECTRONICS TECHNOLOGY CO., LTD
 
+OUI:B01F29*
+ ID_OUI_FROM_DATABASE=Helvetia INC.
+
+OUI:CC0677*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
+OUI:28070D*
+ ID_OUI_FROM_DATABASE=GUANGZHOU WINSOUND INFORMATION TECHNOLOGY CO.,LTD.
+
+OUI:7038EE*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:2CF4C5*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:C8F406*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:3CB15B*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:FCA841*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:50CD22*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:10CDAE*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:B0ADAA*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:00549F*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:6049C1*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:E0D848*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
+OUI:145BE1*
+ ID_OUI_FROM_DATABASE=nyantec UG (haftungsbeschränkt)
+
 OUI:0C6F9C*
  ID_OUI_FROM_DATABASE=Shaw Communications Inc.
 
@@ -24152,21 +24272,6 @@ OUI:0019C6*
 OUI:0015EB*
  ID_OUI_FROM_DATABASE=zte corporation
 
-OUI:A051C6*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:24D921*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:848371*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:7052C5*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:001B4F*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:F0EBD0*
  ID_OUI_FROM_DATABASE=Shanghai Feixun Communication Co.,Ltd.
 
@@ -24302,15 +24407,6 @@ OUI:00259E*
 OUI:001882*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
-OUI:D4EA0E*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:B4475E*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:90FB5B*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:00906F*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -26522,9 +26618,6 @@ OUI:BC811F*
 OUI:34E0CF*
  ID_OUI_FROM_DATABASE=zte corporation
 
-OUI:801DAA*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:6C40C6*
  ID_OUI_FROM_DATABASE=Nimbus Data Systems, Inc.
 
@@ -36125,9 +36218,6 @@ OUI:B824F0*
 OUI:B456B9*
  ID_OUI_FROM_DATABASE=Teraspek Technologies Co.,Ltd
 
-OUI:A009ED*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:68B35E*
  ID_OUI_FROM_DATABASE=Shenzhen Neostra Technology Co.Ltd
 
@@ -37736,6 +37826,51 @@ OUI:206BE7*
 OUI:4857DD*
  ID_OUI_FROM_DATABASE=Facebook Inc
 
+OUI:30074D*
+ ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
+
+OUI:681DEF*
+ ID_OUI_FROM_DATABASE=Shenzhen CYX Technology Co., Ltd.
+
+OUI:AC203E*
+ ID_OUI_FROM_DATABASE=Wuhan Tianyu Information Industry Co., Ltd.
+
+OUI:00A3D1*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
+OUI:801DAA*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:001B4F*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:7052C5*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:848371*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:24D921*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:A051C6*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:90EC50*
+ ID_OUI_FROM_DATABASE=C.O.B.O. SPA
+
+OUI:B4475E*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:D4EA0E*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:A009ED*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:90FB5B*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
 OUI:5846E1*
  ID_OUI_FROM_DATABASE=Baxter International Inc
 
@@ -38057,18 +38192,6 @@ OUI:005053*
 OUI:00500F*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
-OUI:048A15*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:44322A*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:FC8399*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:00040D*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:D842AC*
  ID_OUI_FROM_DATABASE=Shanghai Feixun Communication Co.,Ltd.
 
@@ -38174,24 +38297,6 @@ OUI:308730*
 OUI:002568*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
-OUI:D47856*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:C057BC*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:38BB3C*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:E45D52*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:A4251B*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:6CA849*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:30D17E*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -50576,9 +50681,6 @@ OUI:407183*
 OUI:0059DC*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
-OUI:14612F*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:ACF85C*
  ID_OUI_FROM_DATABASE=Private
 
@@ -50699,9 +50801,6 @@ OUI:0060BD*
 OUI:AC83F3*
  ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
 
-OUI:707C69*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:18DBF2*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -50894,16 +50993,25 @@ OUI:04DEF2*
 OUI:00D071*
  ID_OUI_FROM_DATABASE=ECHELON CORP.
 
+OUI:0030C5*
+ ID_OUI_FROM_DATABASE=CADENCE DESIGN SYSTEMS, INC.
+
 OUI:504061*
  ID_OUI_FROM_DATABASE=Nokia
 
-OUI:0030C5*
- ID_OUI_FROM_DATABASE=CADENCE DESIGN SYSTEMS, INC.
+OUI:7467F7*
+ ID_OUI_FROM_DATABASE=Extreme Networks
+
+OUI:B4C799*
+ ID_OUI_FROM_DATABASE=Extreme Networks
 
 OUI:54E3F6*
  ID_OUI_FROM_DATABASE=Alcatel-Lucent
 
-OUI:7467F7*
+OUI:5C0E8B*
+ ID_OUI_FROM_DATABASE=Extreme Networks
+
+OUI:00E02B*
  ID_OUI_FROM_DATABASE=Extreme Networks
 
 OUI:B0C205*
@@ -50912,27 +51020,18 @@ OUI:B0C205*
 OUI:0C61CF*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
-OUI:B4C799*
- ID_OUI_FROM_DATABASE=Extreme Networks
-
-OUI:5C0E8B*
- ID_OUI_FROM_DATABASE=Extreme Networks
-
-OUI:00E02B*
- ID_OUI_FROM_DATABASE=Extreme Networks
-
 OUI:7C2664*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:E47DEB*
+ ID_OUI_FROM_DATABASE=Shanghai Notion Information Technology CO.,LTD.
+
 OUI:A002DC*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
 OUI:0C47C9*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
-OUI:E47DEB*
- ID_OUI_FROM_DATABASE=Shanghai Notion Information Technology CO.,LTD.
-
 OUI:28EF01*
  ID_OUI_FROM_DATABASE=Private
 
@@ -51011,15 +51110,15 @@ OUI:90F305*
 OUI:00093A*
  ID_OUI_FROM_DATABASE=Molex
 
-OUI:C8F86D*
- ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd
-
 OUI:B8D50B*
  ID_OUI_FROM_DATABASE=Sunitec Enterprise Co.,Ltd
 
 OUI:28A6DB*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:C8F86D*
+ ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd
+
 OUI:D45F25*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
@@ -51044,12 +51143,6 @@ OUI:F4DE0C*
 OUI:BC8AE8*
  ID_OUI_FROM_DATABASE=QING DAO HAIER TELECOM CO.,LTD.
 
-OUI:A81B5A*
- ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
-
-OUI:DC6DCD*
- ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
-
 OUI:440444*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -51065,8 +51158,11 @@ OUI:38295A*
 OUI:4C1A3D*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
-OUI:185207*
- ID_OUI_FROM_DATABASE=SICHUAN TIANYI COMHEART TELECOMCO., LTD
+OUI:A81B5A*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
+OUI:DC6DCD*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
 OUI:70D379*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -51074,6 +51170,9 @@ OUI:70D379*
 OUI:7C4F7D*
  ID_OUI_FROM_DATABASE=Sawwave
 
+OUI:185207*
+ ID_OUI_FROM_DATABASE=SICHUAN TIANYI COMHEART TELECOMCO., LTD
+
 OUI:9874DA*
  ID_OUI_FROM_DATABASE=Infinix mobility limited
 
@@ -51101,21 +51200,6 @@ OUI:EC363F*
 OUI:54FA3E*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
-OUI:B8BBAF*
- ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
-
-OUI:60C5AD*
- ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
-
-OUI:28395E*
- ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
-
-OUI:C4AE12*
- ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
-
-OUI:10D07A*
- ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
-
 OUI:0C8910*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -51134,15 +51218,39 @@ OUI:1867B0*
 OUI:CCB11A*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:B8BBAF*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+OUI:60C5AD*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+OUI:28395E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+OUI:C4AE12*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+OUI:10D07A*
+ ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
+
 OUI:80B234*
  ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 
 OUI:B877C3*
  ID_OUI_FROM_DATABASE=METER Group
 
+OUI:003676*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+OUI:84E058*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:F07485*
  ID_OUI_FROM_DATABASE=NGD Systems, Inc.
 
+OUI:347A60*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:BC644B*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -51167,6 +51275,24 @@ OUI:745612*
 OUI:E46449*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:C005C2*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+OUI:6455B1*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+OUI:203D66*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+OUI:D404CD*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+OUI:446AB7*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+OUI:2C9924*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:001BDD*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -51254,69 +51380,42 @@ OUI:8C09F4*
 OUI:3CDFA9*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
-OUI:003676*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:84E058*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:347A60*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:C005C2*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:6455B1*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:203D66*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:D404CD*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:446AB7*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
-OUI:2C9924*
- ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
-
 OUI:105611*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:2C3AE8*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:DC74A8*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
 OUI:C087EB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
-OUI:2C3AE8*
- ID_OUI_FROM_DATABASE=Espressif Inc.
-
-OUI:74F61C*
- ID_OUI_FROM_DATABASE=HTC Corporation
-
 OUI:E8B6C2*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
 OUI:B0DAF9*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:74F61C*
+ ID_OUI_FROM_DATABASE=HTC Corporation
+
 OUI:3438B7*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
 OUI:5C1A6F*
  ID_OUI_FROM_DATABASE=Cambridge Industries(Group) Co.,Ltd.
 
-OUI:487D2E*
- ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
-
 OUI:B089C2*
  ID_OUI_FROM_DATABASE=Zyptonite
 
 OUI:F0D4F6*
  ID_OUI_FROM_DATABASE=Lars Thrane A/S
 
+OUI:487D2E*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
+
 OUI:0403D6*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
@@ -51326,11 +51425,74 @@ OUI:A0AFBD*
 OUI:34D954*
  ID_OUI_FROM_DATABASE=WiBotic Inc.
 
+OUI:6C60EB*
+ ID_OUI_FROM_DATABASE=ZHI YUAN ELECTRONICS CO., LIMITED
+
+OUI:AC4E2E*
+ ID_OUI_FROM_DATABASE=Shenzhen JingHanDa Electronics Co.Ltd
+
+OUI:B40016*
+ ID_OUI_FROM_DATABASE=INGENICO TERMINALS SAS
+
+OUI:0027E3*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
+OUI:A0341B*
+ ID_OUI_FROM_DATABASE=TrackR, Inc
+
+OUI:FCA667*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
+OUI:784501*
+ ID_OUI_FROM_DATABASE=Biamp Systems
+
+OUI:488D36*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
+OUI:986F60*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
+OUI:4C189A*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
+OUI:E45D52*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:38BB3C*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:C057BC*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:D47856*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:14612F*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:707C69*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
 OUI:A47886*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
-OUI:6C60EB*
- ID_OUI_FROM_DATABASE=ZHI YUAN ELECTRONICS CO., LIMITED
+OUI:44322A*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:048A15*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:6CA849*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:A4251B*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:00040D*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:FC8399*
+ ID_OUI_FROM_DATABASE=Avaya Inc
 
 OUI:D86CE9*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
@@ -51698,24 +51860,6 @@ OUI:F4C714*
 OUI:286ED4*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
-OUI:A01290*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:F81547*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:506184*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:BCADAB*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:B4A95A*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:3C3A73*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:04F938*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -57197,9 +57341,6 @@ OUI:0018FB*
 OUI:0019EE*
  ID_OUI_FROM_DATABASE=CARLO GAVAZZI CONTROLS SPA-Controls Division
 
-OUI:0019F0*
- ID_OUI_FROM_DATABASE=UNIONMAN TECHNOLOGY CO.,LTD
-
 OUI:0019F5*
  ID_OUI_FROM_DATABASE=Imagination Technologies Ltd
 
@@ -65162,11 +65303,50 @@ OUI:F40E83*
 OUI:7C8BCA*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:88B111*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
+OUI:54D751*
+ ID_OUI_FROM_DATABASE=Proximus
+
 OUI:D8F1F0*
  ID_OUI_FROM_DATABASE=Pepxim International Limited
 
-OUI:88B111*
- ID_OUI_FROM_DATABASE=Intel Corporate
+OUI:0019F0*
+ ID_OUI_FROM_DATABASE=UNIONMAN TECHNOLOGY CO.,LTD
+
+OUI:506E92*
+ ID_OUI_FROM_DATABASE=Innocent Technology Co., Ltd.
+
+OUI:CC4B73*
+ ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
+
+OUI:900A1A*
+ ID_OUI_FROM_DATABASE=Taicang T&W Electronics
+
+OUI:CC03D9*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
+OUI:506184*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:F81547*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:A01290*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:B4A95A*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:BCADAB*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:3C3A73*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:60271C*
+ ID_OUI_FROM_DATABASE=VIDEOR E. Hartig GmbH
 
 OUI:2C3996*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
@@ -65495,12 +65675,6 @@ OUI:08181A*
 OUI:002512*
  ID_OUI_FROM_DATABASE=zte corporation
 
-OUI:CCF954*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:703018*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:B0A37E*
  ID_OUI_FROM_DATABASE=Qingdao Haier Telecom Co.，Ltd
 
@@ -65564,30 +65738,6 @@ OUI:84A8E4*
 OUI:202BC1*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
-OUI:3475C7*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:6CFA58*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:64A7DD*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:646A52*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:F873A2*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:64C354*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:B4B017*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
-OUI:581626*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:741BB2*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -72836,9 +72986,6 @@ OUI:000C03*
 OUI:000CA4*
  ID_OUI_FROM_DATABASE=Prompttec Product Management GmbH
 
-OUI:000CAB*
- ID_OUI_FROM_DATABASE=COMMEND International
-
 OUI:000C98*
  ID_OUI_FROM_DATABASE=LETEK Communications Inc.
 
@@ -77210,9 +77357,6 @@ OUI:0C5A9E*
 OUI:00C164*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
-OUI:C4BED4*
- ID_OUI_FROM_DATABASE=Avaya Inc
-
 OUI:98E7F5*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -79063,3 +79207,60 @@ OUI:14780B*
 
 OUI:74DADA*
  ID_OUI_FROM_DATABASE=D-Link International
+
+OUI:4C910C*
+ ID_OUI_FROM_DATABASE=Corporativo Lanix S.A. de C.V.
+
+OUI:BCD713*
+ ID_OUI_FROM_DATABASE=Owl Labs
+
+OUI:E8E1E1*
+ ID_OUI_FROM_DATABASE=Gemtek Technology Co., Ltd.
+
+OUI:98F2B3*
+ ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
+
+OUI:BC1C81*
+ ID_OUI_FROM_DATABASE=Sichuan iLink Technology Co., Ltd.
+
+OUI:CCF954*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:581626*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:B4B017*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:64C354*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:F873A2*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:646A52*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:64A7DD*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:6CFA58*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:3475C7*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:C4BED4*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:30FE31*
+ ID_OUI_FROM_DATABASE=Nokia
+
+OUI:703018*
+ ID_OUI_FROM_DATABASE=Avaya Inc
+
+OUI:78B28D*
+ ID_OUI_FROM_DATABASE=Beijing Tengling Technology CO.Ltd
+
+OUI:000CAB*
+ ID_OUI_FROM_DATABASE=Commend International GmbH