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

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

4 files changed, 331 insertions, 24 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 8a7c180e40..162f3ee71e 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2015-02-27)
+(last updated 2015-03-06)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -102796,7 +102796,7 @@ de Bruxelles, asbl
 25806
   Sonnet Technologies, Inc.
     Nicholas Lekkas
-      nick_lekkas&yahoo.com
+      nick.lekkas&sonnetinc.com
 25807
   heung to middle school (tin shui wai)
     tang kwong shing
@@ -119715,9 +119715,9 @@ Decentralization / Helenic Public Administra
     Jared Bartimus
       Jarediana&theaog.com
 30034
-  Net Care,Inc.
-    Yasuhiro Matsumoto
-      oid&netcare.co.jp
+  IIJ Engineering,Inc. (formerly "Net Care,Inc.")
+    Naohiko Sugiyama
+      oid&iij-engineering.co.jp
 30035
   Formosa Wireless Systems Corp.
     Joy Cheng
@@ -138656,8 +138656,8 @@ Decentralization / Helenic Public Administra
       andreas.christ&sp-lion.com
 34769
   ACORDE TECHNOLOGIES
-    Andres Arribas
-      andres.arribas&acorde.com
+    Jacobo Domínguez
+      jacobo.dominguez&acorde.com
 34770
   Cardiff University
     Ceri Davies
@@ -142072,9 +142072,9 @@ Decentralization / Helenic Public Administra
     Pascal Groß
       pascal.grosz&me.com
 35623
-  Albino Slug Studios
+  stwalkerster.co.uk (formerly "Albino Slug Studios")
     Simon Walker
-      stwalkerster&albinoslugstudios.co.uk
+      simon&stwalkerster.co.uk
 35624
   tuxad.com
     Frank W. Bergmann
@@ -149280,9 +149280,9 @@ Decentralization / Helenic Public Administra
     Arnaud Yonnet
       arnaud.yonnet&mdl29.net
 37425
-  LG-Ericsson Co., Ltd.
+  Ericsson-LG Enterprise Co., Ltd. (formerly "LG-Ericsson Co., Ltd.")
     MIN-SOO PARK, Ph.D.
-      minsoo.park&lgericsson.com
+      minsoo.park&ericssonlg.com
 37426
   Travelzen Group Ltd.
     Erich Cheung
@@ -152749,8 +152749,8 @@ Decentralization / Helenic Public Administra
       Hendrik.Flierman&gdata.de
 38292
   Damall Technologies Sas
-    Maria Lucia
-      info&damalltech.com
+    Silvia Fioranelli
+      info&damallgroup.com
 38293
   Dynamic Technical Solutions Inc.
     Shawn May
@@ -176857,8 +176857,8 @@ Decentralization / Helenic Public Administra
       aditya_mh&telkom.co.id
 44319
   Tulsa Cancer Institute PLLC
-    Madonna Gallant
-      Madonna.Gallant&cancercareokla.com
+    Russell McCarty
+      Russell.McCarty&tciok.org
 44320
   Lake Norman Hematology Oncology
     Betty Adams
@@ -177852,9 +177852,9 @@ Decentralization / Helenic Public Administra
     Piotr Stokluska
       piotr.stokluska&arp.com.pl
 44568
-  Topik Business Services GmbH
+  newnet Marketing (formerly "Topik Business Services GmbH")
     john read
-      john.read&topik-services.com
+      john.read&newnet-marketing.de
 44569
   Regional Networks, Ltd.
     Konstantin A Savchenko
@@ -181155,6 +181155,210 @@ Decentralization / Helenic Public Administra
   OSM GmbH
     Thomas Schiller
       t.schiller&osm-gmbh.de
+45394
+  Mangstor Inc
+    Ashwin Kamath
+      ashwin&mangstor.com
+45395
+  Secrétariat général de l'enseignement catholique
+    Olivier Perrichon
+      o-perrichon&enseignement-catholique.fr
+45396
+  Dejero Labs. Inc
+    IT Support
+      itsupport&dejero.com
+45397
+  ASFINAG Maut Service GmbH
+    Alexander Coreth
+      service&asfinag.at
+45398
+  Segmint, Inc.
+    Keith Veleba
+      keith.veleba&segmint.com
+45399
+  Omemee Engineering Group
+    Scott MacEachern
+      scottm&enggrp.com
+45400
+  Candid Security Solutions LLC
+    Csaba Kadar
+      csaba&candid-ss.com
+45401
+  Unitron NV
+    Stephen Deleu
+      stephen.deleu&unitrongroup.com
+45402
+  Arvet Bank Operations, INC.
+    Mike Calvi
+      mcalvi&arvest.com
+45403
+  ExchangeCore LLC
+    Christopher Hougard
+      chris&exchangecore.com
+45404
+  TightVideo Ltd.
+    Peter Volkov
+      peter.volkov&tightvideo.com
+45405
+  Lee County School System
+    Ryan Hairyes
+      rhairyes&lee.k12.nc.us
+45406
+   BetEasy Pty Ltd
+    Jaiwardhan Puri
+      jaiwardhanp&beteasy.com.au
+45407
+  Northwest Kits
+    Nigel Vander Houwen
+      nigel&nwkits.com
+45408
+  Octavian Technology Ltd
+    Eryk Bottomley
+      eryk&octaviantechnology.com
+45409
+  OneSoft Tecnologia S/A
+    Paulo Rogerio Panhoto
+      paulo.panhoto&flashtrader.com.br
+45410
+  ISAMBERT
+    ISAMBERT Patrick
+      patrick.isambert&isambert.info
+45411
+  Ultra Electronics - Varisys
+    Marcin Jankowski
+      marcin.jankowski&ultra-varisys.com
+45412
+  HGH SYSTEMES INFRAROUGES
+    THOMAS ANTHONY
+      info&hgh.fr
+45413
+  Global IQX
+    Michael de Waal
+      admin&globaliqx.com
+45414
+  SHUYSKIY ZAVOD AKVARIUS LLC
+    Alexandr Tridtsatov
+      at&aqs.ru
+45415
+  Repheka Haiti, Inc.
+    Mario Malivert
+      mmalivert&repheka.org
+45416
+  Chengdu Chengxun Network Technologies Co., Ltd.
+    Jason Deng
+      admin&cxria.com
+45417
+  HCO Computer Products /dba ZGO Tech Hosting
+    Sam Jazaerli
+      sjazaerli&zgohosting.com
+45418
+  ABAST systems
+    Oliver Schwarz
+      oschwarz&nechigroup.com
+45419
+  PhirePhly Design
+    Kenneth W. Finnegan
+      kennethfinnegan2007&gmail.com
+45420
+  Strike XII Development
+    Jairo Cantillo
+      jairo&strikexii.com
+45421
+  Nico Boehr
+    Nico Boehr
+      ianacontact&nicoboehr.de
+45422
+  powerbrand marketing GmbH
+    Patrick Schebek
+      p.schebek&powerbrand.de
+45423
+  Match.com L.L.C.
+    James La Vacca
+      james.lavacca&match.com
+45424
+  The Ghosh Center for Oncology & Hematology
+    Mike Burgin
+      mburgin&theghoshcenter.org
+45425
+  Kadlec Health System
+    Mark Dickson
+      mark.dickson&kadlec.org
+45426
+  Soltec Technology Co., Ltd.
+    Ying-Bin Haung
+      rtarmy&gmail.com
+45427
+  Xiamen Winer Technology Co.,Ltd
+    ShiXu Dai
+      daisx&winertech.com
+45428
+  UrtheCast
+    Aaron Yeung
+      admin-uc&urthecast.com
+45429
+  Instituto Federal Catarinense Campus Sombrio
+    Marco Antonio Silveira de Souza
+      marco&ifc-sombrio.edu.br
+45430
+  Atlas Copco Rock Drills AB (Business Area MR)
+    Tony Petersson
+      tony.petersson&se.atlascopco.com
+45431
+  Nanjing Lopu Co., Ltd.
+    Yang Fei
+      yangf&lopu.com.cn
+45432
+  Cirrato Technologies AB
+    Rob Pike
+      robert.pike&cirrato.com
+45433
+  Finivation Software
+    Guido Belcic
+      gbelcic&finivation.com
+45434
+  Accel Frontline Ltd
+    Rajesh Sharma
+      rajesh.sharma&accelfrontline.in
+45435
+  Cyprus University of Technology
+    Andreas Mouskos
+      andreas.mouskos&cut.ac.cy
+45436
+  THALES Services Lab DT
+    ISAMBERT Patrick
+      patrick.isambert&thalesgroup.com
+45437
+  TEOCO Corporation
+    Zion Alfia
+      ipadmin&teoco.com
+45438
+  AI2M srl
+    Marco Perego
+      info&ai2m.eu
+45439
+  Esterline Belgium bvba
+    Stijn Gevels
+      stijn.gevels&esterline.com
+45440
+  BISS d.o.o.
+    Franjo Žilić
+      franjo.zilic&biss.hr
+45441
+  Safe Internet, LLC
+    Alexander Pustovoyt
+      a.pustovoyt&cstech.ru
+45442
+  Wrocław University of Technology
+    Krzysztof Kołodziejczyk
+      krzysztof.m.kolodziejczyk&pwr.edu.pl
+45443
+  Arca Sistemi Scarl
+    Michele Sandonini
+      michele.sandonini&arcavita.it
+45444
+  ecg.local
+    Ralf Balzer
+      balzer&manthey.it
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 75b8b2b422..2dac4f658b 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -30054,7 +30054,7 @@ const value_string sminmpec_values[] = {
     { 30031, "Penguinlabs LTD" },
     { 30032, "Beijing Xintong Huaan Technologies Co. Ltd" },
     { 30033, "Atabyte" },
-    { 30034, "Net Care,Inc." },
+    { 30034, "IIJ Engineering,Inc. (formerly \"Net Care,Inc.\")" },
     { 30035, "Formosa Wireless Systems Corp." },
     { 30036, "Nomad Digital Ltd" },
     { 30037, "Company Extrim pro, Ltd." },
@@ -35643,7 +35643,7 @@ const value_string sminmpec_values[] = {
     { 35620, "William Beaumont Hospitals" },
     { 35621, "Patrick Kobly" },
     { 35622, "Akaflieg Stuttgart" },
-    { 35623, "Albino Slug Studios" },
+    { 35623, "stwalkerster.co.uk (formerly \"Albino Slug Studios\")" },
     { 35624, "tuxad.com" },
     { 35625, "Vembu Technologies Private Limited" },
     { 35626, "CHONGQING JINGHONG HI-TECH CO.,LTD" },
@@ -37445,7 +37445,7 @@ const value_string sminmpec_values[] = {
     { 37422, "Start Norge" },
     { 37423, "DynaMITe Services" },
     { 37424, "MDL29" },
-    { 37425, "LG-Ericsson Co., Ltd." },
+    { 37425, "Ericsson-LG Enterprise Co., Ltd. (formerly \"LG-Ericsson Co., Ltd.\")" },
     { 37426, "Travelzen Group Ltd." },
     { 37427, "ENTE" },
     { 37428, "B\0303\0274rkert Werke GmbH" },
@@ -44588,7 +44588,7 @@ const value_string sminmpec_values[] = {
     { 44565, "LECKERBEEF.de" },
     { 44566, "OOO Komandor-holding" },
     { 44567, "Agencja Rozwoju Przemyslu S.A." },
-    { 44568, "Topik Business Services GmbH" },
+    { 44568, "newnet Marketing (formerly \"Topik Business Services GmbH\")" },
     { 44569, "Regional Networks, Ltd." },
     { 44570, "Lancaster Cancer Center" },
     { 44571, "Solinea, Inc" },
@@ -45414,6 +45414,57 @@ const value_string sminmpec_values[] = {
     { 45391, "PLC Group" },
     { 45392, "Quadro Group LLC" },
     { 45393, "OSM GmbH" },
+    { 45394, "Mangstor Inc" },
+    { 45395, "Secr\0303\0251tariat g\0303\0251n\0303\0251ral de l'enseignement catholique" },
+    { 45396, "Dejero Labs. Inc" },
+    { 45397, "ASFINAG Maut Service GmbH" },
+    { 45398, "Segmint, Inc." },
+    { 45399, "Omemee Engineering Group" },
+    { 45400, "Candid Security Solutions LLC" },
+    { 45401, "Unitron NV" },
+    { 45402, "Arvet Bank Operations, INC." },
+    { 45403, "ExchangeCore LLC" },
+    { 45404, "TightVideo Ltd." },
+    { 45405, "Lee County School System" },
+    { 45406, sminmpec_unknown },  /* (Added by Wireshark) */
+    { 45407, "Northwest Kits" },
+    { 45408, "Octavian Technology Ltd" },
+    { 45409, "OneSoft Tecnologia S/A" },
+    { 45410, "ISAMBERT" },
+    { 45411, "Ultra Electronics - Varisys" },
+    { 45412, "HGH SYSTEMES INFRAROUGES" },
+    { 45413, "Global IQX" },
+    { 45414, "SHUYSKIY ZAVOD AKVARIUS LLC" },
+    { 45415, "Repheka Haiti, Inc." },
+    { 45416, "Chengdu Chengxun Network Technologies Co., Ltd." },
+    { 45417, "HCO Computer Products /dba ZGO Tech Hosting" },
+    { 45418, "ABAST systems" },
+    { 45419, "PhirePhly Design" },
+    { 45420, "Strike XII Development" },
+    { 45421, "Nico Boehr" },
+    { 45422, "powerbrand marketing GmbH" },
+    { 45423, "Match.com L.L.C." },
+    { 45424, "The Ghosh Center for Oncology & Hematology" },
+    { 45425, "Kadlec Health System" },
+    { 45426, "Soltec Technology Co., Ltd." },
+    { 45427, "Xiamen Winer Technology Co.,Ltd" },
+    { 45428, "UrtheCast" },
+    { 45429, "Instituto Federal Catarinense Campus Sombrio" },
+    { 45430, "Atlas Copco Rock Drills AB (Business Area MR)" },
+    { 45431, "Nanjing Lopu Co., Ltd." },
+    { 45432, "Cirrato Technologies AB" },
+    { 45433, "Finivation Software" },
+    { 45434, "Accel Frontline Ltd" },
+    { 45435, "Cyprus University of Technology" },
+    { 45436, "THALES Services Lab DT" },
+    { 45437, "TEOCO Corporation" },
+    { 45438, "AI2M srl" },
+    { 45439, "Esterline Belgium bvba" },
+    { 45440, "BISS d.o.o." },
+    { 45441, "Safe Internet, LLC" },
+    { 45442, "Wroc\0305\0202aw University of Technology" },
+    { 45443, "Arca Sistemi Scarl" },
+    { 45444, "ecg.local" },
     {    0, NULL}
 };
 
diff --git a/manuf b/manuf
index 1181d34b54..3246653947 100644
--- a/manuf
+++ b/manuf
@@ -10486,6 +10486,7 @@
 00:30:FD	Integrat               # INTEGRATED SYSTEMS DESIGN
 00:30:FE	Dsa                    # DSA GmbH
 00:30:FF	Datafab                # DATAFAB SYSTEMS, INC.
+00:32:3A	So-Logic
 00:33:6C	Synapsen               # SynapSense Corporation
 00:34:F1	RadicomR               # Radicom Research, Inc.
 00:35:32	Electro-               # Electro-Metrics Corporation
@@ -17328,6 +17329,7 @@
 08:25:22	Advansee
 08:27:19	ApsSyste               # APS systems/electronic AG
 08:2A:D0	SrdInnov               # SRD Innovations Inc.
+08:2C:B0	NetworkI               # Network Instruments
 08:2E:5F	HewlettP               # Hewlett Packard
 08:35:71	Caswell                # CASwell INC.
 08:37:3D	SamsungE               # Samsung Electronics Co.,Ltd
@@ -17410,6 +17412,7 @@
 08:EB:29	JiangsuH               # Jiangsu Huitong Group Co.,Ltd.
 08:EB:74	Humax
 08:EB:ED	WorldEli               # World Elite Technology Co.,LTD
+08:EC:A9	SamsungE               # Samsung Electronics Co.,Ltd
 08:ED:B9	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 08:EE:8B	SamsungE               # Samsung Elec Co.,Ltd
 08:EF:3B	McsLogic               # MCS Logic Inc.
@@ -17588,6 +17591,7 @@
 10:3B:59	SamsungE               # Samsung Electronics Co.,Ltd
 10:3D:EA	HfcTechn               # HFC Technology (Beijing) Ltd. Co.
 10:40:F3	Apple
+10:41:7F	Apple                  # Apple Inc
 10:43:69	Soundmax               # Soundmax Electronic Limited
 10:44:5A	ShaanxiH               # Shaanxi Hitech Electronic Co., LTD
 10:45:BE	Norphoni               # Norphonic AS
@@ -17705,6 +17709,7 @@
 14:2D:F5	Amphitec               # Amphitech
 14:30:7A	Avermetr               # Avermetrics
 14:30:C6	Motorola               # Motorola Mobility LLC
+14:32:D1	SamsungE               # Samsung Electronics Co.,Ltd
 14:35:8B	Mediabri               # Mediabridge Products, LLC.
 14:35:B3	FutureDe               # Future Designs, Inc.
 14:36:05	Nokia                  # Nokia Corporation
@@ -17798,6 +17803,7 @@
 18:10:4E	Cedint-U               # CEDINT-UPM
 18:14:20	TebSas                 # TEB SAS
 18:14:56	Nokia                  # Nokia Corporation
+18:16:C9	SamsungE               # Samsung Electronics Co.,Ltd
 18:17:14	Daewoois
 18:17:25	CameoCom               # Cameo Communications, Inc.
 18:19:3F	TamtronO               # Tamtron Oy
@@ -18000,6 +18006,7 @@
 1C:AA:07	Cisco                  # CISCO SYSTEMS, INC.
 1C:AB:01	Innovolt
 1C:AB:A7	Apple
+1C:AD:D1	BosungEl               # Bosung Electronics Co., Ltd.
 1C:AF:05	SamsungE               # Samsung Electronics Co.,Ltd
 1C:AF:F7	D-LinkIn               # D-LINK INTERNATIONAL PTE LIMITED
 1C:B0:94	Htc                    # HTC Corporation
@@ -18245,6 +18252,7 @@
 24:DE:C6	ArubaNet               # Aruba Networks
 24:E2:71	QingdaoH               # Qingdao Hisense Communications Co.,Ltd
 24:E3:14	Apple
+24:E5:AA	PhilipsO               # Philips Oral Healthcare, Inc.
 24:E6:BA	JscZavod               # JSC Zavod im. Kozitsky
 24:E9:B3	Cisco
 24:EA:40	SystemeH               # Systeme Helmholz GmbH
@@ -18650,6 +18658,7 @@
 34:75:C7	Avaya                  # Avaya, Inc
 34:76:C5	I-ODataD               # I-O DATA DEVICE, INC.
 34:78:77	O-NetCom               # O-NET Communications(Shenzhen) Limited
+34:7A:60	Pace                   # Pace plc
 34:7E:39	NokiaDan               # Nokia Danmark A/S
 34:81:37	UnicardS               # UNICARD SA
 34:81:C4	Avm                    # AVM GmbH
@@ -18665,6 +18674,7 @@
 34:99:6F	VpiEngin               # VPI Engineering
 34:99:D7	Universa               # Universal Flow Monitors, Inc.
 34:9A:0D	ZbdDispl               # ZBD Displays Ltd
+34:9B:5B	Maquet                 # Maquet GmbH
 34:9D:90	Heinzman               # Heinzmann GmbH & CO. KG
 34:9E:34	Evervict               # Evervictory Electronic Co.Ltd
 34:A1:83	Aware                  # AWare, Inc
@@ -18947,6 +18957,7 @@
 3C:D7:DA	SkMtekMi               # SK Mtek microelectronics(shenzhen)limited
 3C:D9:2B	Hewlett-               # Hewlett-Packard Company
 3C:D9:CE	EclipseW               # Eclipse WiFi
+3C:DA:2A	Zte                    # zte corporation
 3C:DF:1E	Cisco                  # CISCO SYSTEMS, INC.
 3C:DF:A9	ArrisGro               # ARRIS Group, Inc.
 3C:DF:BD	HuaweiTe               # Huawei Technologies Co., Ltd
@@ -19685,6 +19696,7 @@
 44:E9:DD	Sagemcom               # SAGEMCOM SAS
 44:ED:57	Longicor               # Longicorn, inc.
 44:EE:30	Budelman               # Budelmann Elektronik GmbH
+44:F4:36	Zte                    # zte corporation
 44:F4:59	SamsungE               # Samsung Electronics
 44:F4:77	JuniperN               # Juniper Networks
 44:F8:49	UnionPac               # Union Pacific Railroad
@@ -19694,6 +19706,7 @@
 48:03:62	DesayEle               # DESAY ELECTRONICS(HUIZHOU)CO.,LTD
 48:06:6A	Tempered               # Tempered Networks, Inc.
 48:0C:49	NakayoTe               # NAKAYO TELECOMMUNICATIONS,INC
+48:0F:CF	HewlettP               # Hewlett Packard
 48:12:49	LuxcomTe               # Luxcom Technologies Inc.
 48:13:F3	BbkElect               # BBK Electronics Corp., Ltd.
 48:17:4C	Micropow               # MicroPower technologies
@@ -20008,6 +20021,7 @@
 50:ED:78	Changzho               # Changzhou Yongse Infotech Co.,Ltd
 50:ED:94	EgatelSl               # Egatel SL
 50:F0:03	OpenStac               # Open Stack, Inc.
+50:F0:D3	SamsungE               # Samsung Electronics Co.,Ltd
 50:F4:3C	Leeo                   # Leeo Inc
 50:F5:20	SamsungE               # Samsung Electronics Co.,Ltd
 50:F6:1A	KunshanJ               # Kunshan JADE Technologies co., Ltd.
@@ -20046,6 +20060,7 @@
 54:39:68	Edgewate               # Edgewater Networks Inc
 54:39:DF	HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 54:3D:37	RuckusWi               # Ruckus Wireless
+54:40:AD	SamsungE               # Samsung Electronics Co.,Ltd
 54:42:49	Sony                   # Sony Corporation
 54:44:08	Nokia                  # Nokia Corporation
 54:46:6B	Shenzhen               # Shenzhen CZTIC Electronic Technology Co., Ltd
@@ -20270,6 +20285,7 @@
 5C:40:58	Jefferso               # Jefferson Audio Video Systems, Inc.
 5C:41:E7	WiatecIn               # Wiatec International Ltd.
 5C:43:D2	Hazemeye               # HAZEMEYER
+5C:45:27	JuniperN               # Juniper Networks
 5C:4A:26	EnguityT               # Enguity Technology Corp
 5C:4C:A9	Shenzhen               # Shenzhen Huawei Communication Technologies Co., Ltd
 5C:50:15	Cisco                  # CISCO SYSTEMS, INC.
@@ -20627,6 +20643,7 @@
 64:F6:9D	Cisco
 64:F9:70	KenadeEl               # Kenade Electronics Technology Co.,LTD.
 64:F9:87	Avvasi                 # Avvasi Inc.
+64:FB:81	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM public listing for more information.
 64:FC:8C	Zonar                  # Zonar Systems
 68:05:71	SamsungE               # Samsung Electronics Co.,Ltd
 68:05:CA	IntelCor               # Intel Corporate
@@ -20814,6 +20831,7 @@
 6C:9B:02	Nokia                  # Nokia Corporation
 6C:9C:E9	NimbleSt               # Nimble Storage
 6C:9C:ED	Cisco                  # CISCO SYSTEMS, INC.
+6C:A1:00	IntelCor               # Intel Corporate
 6C:A6:82	EdamInfo               # EDAM information & communications
 6C:A7:5F	Zte                    # zte corporation
 6C:A7:80	Nokia                  # Nokia Corporation
@@ -21057,6 +21075,7 @@
 70:B3:D5:2D:40:00/36	Ct                     # CT Company
 70:B3:D5:2D:50:00/36	TeucoGuz               # Teuco Guzzini
 70:B3:D5:2D:A0:00/36	SkywaveN               # Skywave Networks Private Limited
+70:B3:D5:2D:C0:00/36	BolideTe               # Bolide Technology Group, Inc.
 70:B3:D5:2E:30:00/36	Meiknolo               # Meiknologic GmbH
 70:B3:D5:2F:00:00/36	Clock-O-               # Clock-O-Matic
 70:B3:D5:2F:10:00/36	InspikeS               # Inspike S.R.L.
@@ -21120,6 +21139,7 @@
 70:B3:D5:45:E0:00/36	Esol                   # eSOL Co.,Ltd.
 70:B3:D5:46:B0:00/36	Airborne               # Airborne Engineering Limited
 70:B3:D5:46:F0:00/36	ServaTra               # serva transport systems GmbH
+70:B3:D5:47:20:00/36	QuadioDe               # Quadio Devices Private Limited
 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.
@@ -21142,6 +21162,7 @@
 70:B3:D5:51:E0:00/36	Fundació               # Fundación Cardiovascular de Colombia
 70:B3:D5:52:B0:00/36	GeAviati               # GE Aviation Cheltenham
 70:B3:D5:53:00:00/36	Isis-Ex                # iSiS-Ex Limited
+70:B3:D5:53:80:00/36	Sydetion               # sydetion UG (h.b.)
 70:B3:D5:54:D0:00/36	QingdaoH               # Qingdao Haitian Weiye Automation Control System Co., Ltd
 70:B3:D5:54:E0:00/36	RflElect               # RFL Electronics, Inc.
 70:B3:D5:55:90:00/36	EagleMou               # Eagle Mountain Technology
@@ -21187,6 +21208,7 @@
 70:B3:D5:67:90:00/36	Emac                   # EMAC, Inc.
 70:B3:D5:68:20:00/36	Rosslare               # Rosslare Enterprises Limited
 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:6D:10:00/36	VisualEn               # Visual Engineering Technologies Ltd
 70:B3:D5:6D:30:00/36	Deuta-We               # DEUTA-WERKE GmbH
@@ -21196,6 +21218,7 @@
 70:B3:D5:6E:00:00/36	Abb-Dmpc               # ABB SPA - DMPC
 70:B3:D5:6E:40:00/36	Institut               # Institute of Power Engineering, Gdansk Division
 70:B3:D5:6E:50:00/36	Deuta-We               # DEUTA-WERKE GmbH
+70:B3:D5:6E:80:00/36	Bluwirel               # BluWireless Technology Ltd
 70:B3:D5:6E:D0:00/36	Wiingtec               # Wiingtech International Co. LTD.
 70:B3:D5:6F:20:00/36	P&CMicro               # P&C Micro's Pty Ltd
 70:B3:D5:6F:30:00/36	Iungo
@@ -21271,6 +21294,7 @@
 70:B3:D5:91:80:00/36	GlovaRai               # Glova Rail A/S
 70:B3:D5:91:E0:00/36	Creotech               # Creotech Instruments S.A.
 70:B3:D5:92:30:00/36	EumigInd               # eumig industrie-tv GmbH
+70:B3:D5:93:20:00/36	Rohde&Sc               # Rohde&Schwarz Topex SA
 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	Triax                  # Triax A/S
@@ -21289,6 +21313,7 @@
 70:B3:D5:9C:A0:00/36	KomsisEl               # KOMSIS ELEKTRONIK SISTEMLERI SAN. TIC. LTD.STI
 70:B3:D5:9D:30:00/36	Communic               # Communication Technology Ltd.
 70:B3:D5:9D:B0:00/36	CasMedic               # CAS Medical Systems, Inc
+70:B3:D5:9E:70:00/36	XiamenMa               # Xiamen Maxincom Technologies Co., Ltd.
 70:B3:D5:9F:10:00/36	Rfel                   # RFEL Ltd
 70:B3:D5:9F:40:00/36	TbandSrl               # Tband srl
 70:B3:D5:9F:50:00/36	VickersE               # Vickers Electronics Ltd
@@ -21363,6 +21388,7 @@
 70:B3:D5:B9:B0:00/36	Elektron               # Elektronik Art
 70:B3:D5:BA:40:00/36	EiwaGike               # EIWA GIKEN INC.
 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	Mettler-               # Mettler-Toledo Hi-Speed
 70:B3:D5:BB:D0:00/36	Providiu               # Providius Corp
 70:B3:D5:BB:E0:00/36	SunriseE               # Sunrise Systems Electronics Co. Inc.
@@ -21395,6 +21421,7 @@
 70:B3:D5:C7:30:00/36	CDN                    # C.D.N.CORPORATION
 70:B3:D5:C7:80:00/36	NetaElek               # NETA Elektronik AS
 70:B3:D5:C8:10:00/36	DspDesig               # DSP DESIGN
+70:B3:D5:C8:50:00/36	SolidSta               # Solid State Disks Ltd
 70:B3:D5:C8:70:00/36	Siemens                # Siemens AG
 70:B3:D5:C8:D0:00/36	KstTechn               # KST Technology
 70:B3:D5:C9:60:00/36	UniDimen               # UNI DIMENXI SDN BHD
@@ -21448,6 +21475,7 @@
 70:B3:D5:DF:20:00/36	Aml
 70:B3:D5:DF:30:00/36	SpcBiocl               # SPC Bioclinicum
 70:B3:D5:DF:60:00/36	Tiab                   # Tiab Limited
+70:B3:D5:DF:90:00/36	KoreaPla               # Korea Plant Maintenance
 70:B3:D5:E0:70:00/36	BaaderPl               # Baader Planetarium GmbH
 70:B3:D5:E0:80:00/36	Olssen
 70:B3:D5:E2:00:00/36	Signatur               # Signature Control Systems, LLC.
@@ -21499,6 +21527,7 @@
 70:B3:D5:F2:B0:00/36	Sensys                 # SENSYS GmbH
 70:B3:D5:F2:C0:00/36	HengenTe               # Hengen Technologies GmbH
 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
 70:B3:D5:F3:90:00/36	ZenrosAp               # Zenros ApS
 70:B3:D5:F4:C0:00/36	GlobalLi               # Global Lightning Protection Services A(S
@@ -21782,6 +21811,8 @@
 78:B6:C1	AoboTele               # AOBO Telecom Co.,Ltd
 78:B8:1A	InterSal               # INTER SALES A/S
 78:BA:D0	Shinybow               # Shinybow Technology Co. Ltd.
+78:BA:F9	Cisco
+78:BD:BC	SamsungE               # Samsung Electronics Co.,Ltd
 78:BE:B6	Enhanced               # Enhanced Vision
 78:BE:BD	Stulz                  # STULZ GmbH
 78:C4:0E	H&DWirel               # H&D Wireless
@@ -21910,7 +21941,7 @@
 7C:B0:3E	Osram                  # OSRAM GmbH
 7C:B1:77	Satelco                # Satelco AG
 7C:B2:1B	CiscoSpv               # Cisco SPVTG
-7C:B2:32	TclKingH               # TCL King High Frequency EI,Co.,LTD
+7C:B2:32	HuiZhouG               # Hui Zhou Gaoshengda Technology Co.,LTD
 7C:B5:42	AcesTech               # ACES Technology
 7C:B7:33	AskeyCom               # ASKEY COMPUTER CORP
 7C:B7:7B	Paradigm               # Paradigm Electronics Inc
@@ -21955,6 +21986,7 @@
 7C:F0:BA	Linkwell               # Linkwell Telesystems Pvt Ltd
 7C:F4:29	Nuuo                   # NUUO Inc.
 7C:F8:54	SamsungE               # Samsung Electronics
+7C:F9:0E	SamsungE               # Samsung Electronics Co.,Ltd
 7C:FA:DF	Apple
 7C:FE:28	Salutron               # Salutron Inc.
 7C:FE:4E	Shenzhen               # Shenzhen Safe vision Technology Co.,LTD
@@ -21998,6 +22030,7 @@
 80:48:A5	SichuanT               # SICHUAN TIANYI COMHEART TELECOM CO.,LTD
 80:49:71	Apple
 80:4B:20	Ventilat               # Ventilation Control
+80:4E:81	SamsungE               # Samsung Electronics Co.,Ltd
 80:4F:58	Thinkeco               # ThinkEco, Inc.
 80:50:1B	Nokia                  # Nokia Corporation
 80:50:67	WDTechno               # W & D TECHNOLOGY CORPORATION
@@ -22083,6 +22116,7 @@
 84:01:A7	Greyware               # Greyware Automation Products, Inc
 84:0B:2D	SamsungE               # SAMSUNG ELECTRO-MECHANICS CO., LTD
 84:0F:45	Shanghai               # Shanghai GMT Digital Technologies Co., Ltd
+84:11:9E	SamsungE               # Samsung Electronics Co.,Ltd
 84:17:15	GpElectr               # GP Electronics (HK) Ltd.
 84:17:66	WeifangG               # Weifang GoerTek Electronics Co., Ltd
 84:18:26	Osram                  # Osram GmbH
@@ -22105,6 +22139,7 @@
 84:2B:2B	Dell                   # Dell Inc.
 84:2B:50	Huria                  # Huria Co.,Ltd.
 84:2B:BC	Modellei               # Modelleisenbahn GmbH
+84:2E:27	SamsungE               # Samsung Electronics Co.,Ltd
 84:2F:75	InnokasG               # Innokas Group
 84:30:E5	Skyhawke               # SkyHawke Technologies, LLC
 84:32:EA	AnhuiWan               # ANHUI WANZTEN P&T CO., LTD
@@ -22226,6 +22261,7 @@
 88:35:4C	Transics
 88:36:12	SrcCompu               # SRC Computers, LLC
 88:3B:8B	Cheering               # Cheering Connection Co. Ltd.
+88:41:57	Shenzhen               # Shenzhen Atsmart Technology Co.,Ltd.
 88:41:C1	OrbisatD               # ORBISAT DA AMAZONIA IND E AEROL SA
 88:41:FC	AirtiesW               # AirTies Wireless Netowrks
 88:43:E1	Cisco                  # CISCO SYSTEMS, INC.
@@ -22487,6 +22523,7 @@
 90:67:B5	Alcatel-               # Alcatel-Lucent
 90:67:F3	AlcatelL               # Alcatel Lucent
 90:68:C3	Motorola               # Motorola Mobility LLC
+90:6C:AC	Fortinet               # Fortinet, Inc.
 90:6D:C8	DlgAutom               # DLG Automação Industrial Ltda
 90:6E:BB	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 90:70:25	GareaMic               # Garea Microsys Co.,Ltd.
@@ -22898,6 +22935,7 @@
 9C:F8:DB	Shenzhen               # shenzhen eyunmei technology co,.ltd
 9C:F9:38	ArevaNp                # AREVA NP GmbH
 9C:FB:F1	Mesomati               # MESOMATIC GmbH & Co.KG
+9C:FC:01	Apple                  # Apple Inc
 9C:FF:BE	Otsl                   # OTSL Inc.
 A0:02:DC	AmazonTe               # Amazon Technologies Inc.
 A0:03:63	RobertBo               # Robert Bosch Healthcare GmbH
@@ -23279,6 +23317,7 @@ AC:18:26	SeikoEps               # SEIKO EPSON CORPORATION
 AC:19:9F	SungrowP               # SUNGROW POWER SUPPLY CO.,LTD.
 AC:20:AA	Dmatek                 # DMATEK Co., Ltd.
 AC:22:0B	AsustekC               # ASUSTek COMPUTER INC.
+AC:29:3A	Apple                  # Apple Inc
 AC:2D:A3	Txtr                   # TXTR GmbH
 AC:2F:A8	Humannix               # Humannix Co.,Ltd.
 AC:31:9D	Shenzhen               # Shenzhen TG-NET Botone Technology Co.,Ltd.
@@ -23305,6 +23344,7 @@ AC:51:EE	Cambridg               # Cambridge Communication Systems Ltd
 AC:54:EC	IeeeP182               # IEEE P1823 Standards Working Group
 AC:56:2C	LavaInte               # LAVA INTERNATIONAL(H.K) LIMITED
 AC:58:3B	HumanAss               # Human Assembler, Inc.
+AC:5A:14	SamsungE               # Samsung Electronics Co.,Ltd
 AC:5D:10	PaceAmer               # Pace Americas
 AC:5E:8C	Utillink
 AC:61:23	Drivven                # Drivven, Inc.
@@ -24006,6 +24046,7 @@ C4:0A:CB	Cisco                  # CISCO SYSTEMS, INC.
 C4:0E:45	AckNetwo               # ACK Networks,Inc.
 C4:0F:09	HermesEl               # Hermes electronic GmbH
 C4:10:8A	RuckusWi               # Ruckus Wireless
+C4:12:F5	D-LinkIn               # D-Link International
 C4:13:E2	Aerohive               # Aerohive Networks Inc.
 C4:14:3C	Cisco
 C4:16:FA	Prysm                  # Prysm Inc
@@ -24109,6 +24150,7 @@ C4:E1:7C	U2s                    # U2S co.
 C4:E7:BE	Scspro                 # SCSpro Co.,Ltd
 C4:E9:2F	Sciex                  # AB Sciex
 C4:E9:84	Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
+C4:EA:1D	Technico               # Technicolor
 C4:EB:E3	RrcnSas                # RRCN SAS
 C4:ED:BA	TexasIns               # Texas Instruments
 C4:EE:AE	VssMonit               # VSS Monitoring
@@ -24140,6 +24182,7 @@ C8:2E:94	HalfaEnt               # Halfa Enterprise Co., Ltd.
 C8:31:68	Ezex                   # eZEX corporation
 C8:32:32	HuntingI               # Hunting Innova
 C8:33:4B	Apple
+C8:34:8E	IntelCor               # Intel Corporate
 C8:35:B8	Ericsson               # Ericsson, EAB/RWI/K
 C8:3A:35	TendaTec               # Tenda Technology Co., Ltd.
 C8:3B:45	Jri-Maxa               # JRI-Maxant
@@ -24380,6 +24423,7 @@ D0:22:12	IeeeRegi               # IEEE REGISTRATION AUTHORITY  - Please see MAM
 D0:22:BE	SamsungE               # Samsung Electro Mechanics co.,LTD.
 D0:23:DB	Apple
 D0:25:16	Shenzhen               # SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
+D0:25:98	Apple                  # Apple Inc
 D0:27:88	HonHaiPr               # Hon Hai Precision Ind.Co.Ltd
 D0:2C:45	Littlebi               # littleBits Electronics, Inc.
 D0:2D:B3	HuaweiTe               # Huawei Technologies Co., Ltd
@@ -24697,6 +24741,7 @@ D8:97:3B	ArtesynE               # Artesyn Embedded Technologies
 D8:97:60	C2Develo               # C2 Development, Inc.
 D8:97:7C	GreyInno               # Grey Innovation
 D8:97:BA	Pegatron               # PEGATRON CORPORATION
+D8:9A:34	BeijingS               # Beijing SHENQI Technology Co., Ltd.
 D8:9D:67	HewlettP               # Hewlett Packard
 D8:9D:B9	Emegatec               # eMegatech International Corp.
 D8:9E:3F	Apple
@@ -24954,6 +24999,7 @@ E0:D3:1A	EquesTec               # EQUES Technology Co., Limited
 E0:D7:BA	TexasIns               # Texas Instruments
 E0:D9:A2	HippihAp               # Hippih aps
 E0:DA:DC	JvcKenwo               # JVC KENWOOD Corporation
+E0:DB:10	SamsungE               # Samsung Electronics Co.,Ltd
 E0:DB:55	Dell                   # Dell Inc
 E0:DB:88	OpenStan               # Open Standard Digital-IF Interface for SATCOM Systems
 E0:DC:A0	SiemensE               # Siemens Electrical Apparatus Ltd., Suzhou Chengdu Branch
@@ -25072,6 +25118,7 @@ E4:F8:9C	IntelCor               # Intel Corporate
 E4:F8:EF	SamsungE               # Samsung Elec Co.,Ltd
 E4:F9:39	MinxonHo               # Minxon Hotel Technology INC.
 E4:FA:1D	PadPerip               # PAD Peripheral Advanced Design Inc.
+E4:FA:FD	IntelCor               # Intel Corporate
 E4:FE:D9	EdmiEuro               # EDMI Europe Ltd
 E4:FF:DD	Electron               # ELECTRON INDIA
 E8:03:9A	SamsungE               # Samsung Electronics CO., LTD
@@ -25356,6 +25403,7 @@ F0:73:AE	Peak-Sys               # PEAK-System Technik
 F0:76:1C	CompalIn               # COMPAL INFORMATION (KUNSHAN) CO., LTD.
 F0:77:65	Sourcefi               # Sourcefire, Inc
 F0:77:D0	Xcellen
+F0:78:16	Cisco
 F0:79:59	AsustekC               # ASUSTek COMPUTER INC.
 F0:7B:CB	HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 F0:7D:68	D-Link                 # D-Link Corporation
diff --git a/services b/services
index bf9494a696..728e974daf 100644
--- a/services
+++ b/services
@@ -9064,6 +9064,7 @@ max              6074/udp # Microsoft Max [Jay_Beavers] [Jay_Beavers] 2006-02
 dpm-acm          6075/tcp # Microsoft DPM Access Control Manager [Prabu_Ambravaneswara] [Prabu_Ambravaneswara] 2009-10-29
 msft-dpm-cert    6076/tcp # Microsoft DPM WCF Certificates [Microsoft_Corporation] [Prateek_Sharma] 2011-08-04
 iconstructsrv    6077/tcp # iConstruct Server [iConstruct_Aus_Pty_Ltd] [Afshin_Jafari] 2012-12-21
+gue              6080/udp # Generic UDP Encapsulation [Tom_Herbert] [Tom_Herbert] 2015-03-05 [draft-herbert-gue]
 geneve           6081/udp # Generic Network Virtualization Encapsulation (Geneve) [Jesse_Gross] [Jesse_Gross] 2014-03-27 [draft-gross-geneve-00]
 p25cai           6082/udp # APCO Project 25 Common Air Interface - UDP encapsulation [APCO_Project] [APCO_Project] 2011-05-13
 miami-bcast      6083/udp # telecomsoftware miami broadcast [Peter_Steiner] [Peter_Steiner] 2011-02-22
@@ -10110,8 +10111,8 @@ dxspider         8873/udp # dxspider linking protocol [Dirk_Koopman] [Dirk_Koopm
 cddbp-alt        8880/tcp # CDDBP [Steve_Scherf] [Steve_Scherf]
 cddbp-alt        8880/udp # CDDBP [Steve_Scherf] [Steve_Scherf]
 galaxy4d         8881/tcp # Galaxy4D Online Game Engine [Galaxy4D] [Olivier_St-Laurent] 2012-06-18
-secure-mqtt      8883/tcp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27
-secure-mqtt      8883/udp # Secure MQTT [Arthur_Barr] [Arthur_Barr] 2008-02-27
+secure-mqtt      8883/tcp # Secure MQTT [OASIS] [Robin_Cover] 2008-02-27 2015-03-06
+secure-mqtt      8883/udp # Secure MQTT [OASIS] [Robin_Cover] 2008-02-27 2015-03-06
 ddi-tcp-1        8888/tcp # NewsEDGE server TCP (TCP 1) [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8888
 ddi-udp-1        8888/udp # NewsEDGE server UDP (UDP 1) [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8888
 ddi-tcp-2        8889/tcp # Desktop Data TCP 1 [Fred_Yao] [Fred_Yao] Known Unauthorized Use on port 8889
@@ -11003,6 +11004,8 @@ wnn6            22273/tcp # wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit]
 wnn6            22273/udp # wnn6 [Yasunari_Gon_Yamasit] [Yasunari_Gon_Yamasit]
 cis             22305/tcp # CompactIS Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16
 cis             22305/udp # CompactIS Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16
+shrewd-control  22335/tcp # Initium Labs Security and Automation Control [Initium_Labs_LLC] [Manbir_Sahni] 2015-03-06
+shrewd-stream   22335/udp # Initium Labs Security and Automation Streaming [Initium_Labs_LLC] [Manbir_Sahni] 2015-03-06
 cis-secure      22343/tcp # CompactIS Secure Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16
 cis-secure      22343/udp # CompactIS Secure Tunnel [Justin_Paupore] [Justin_Paupore] 2007-08-16
 wibukey         22347/tcp # WibuKey Standard WkLan [Wolfgang_Voelker] [Wolfgang_Voelker] 2007-06
@@ -11075,6 +11078,7 @@ binkp           24554/tcp # BINKP [Max_Masyutin] [Max_Masyutin]
 binkp           24554/udp # BINKP [Max_Masyutin] [Max_Masyutin]
 bilobit         24577/tcp # bilobit Service [bilobit_GmbH] [Martin_Schmuker] 2014-08-15
 bilobit-update  24577/udp # bilobit Service Update [bilobit_GmbH] [Martin_Schmuker] 2014-08-15
+sdtvwcam        24666/tcp # Service used by SmarDTV to communicate between a CAM and a second screen application [SmarDTV] [Vincent_Demortier] 2015-03-04
 canditv         24676/tcp # Canditv Message Service [Gary_Aston] [Gary_Aston] 2009-03-10
 canditv         24676/udp # Canditv Message Service [Gary_Aston] [Gary_Aston] 2009-03-10
 flashfiler      24677/tcp # FlashFiler [Ben_Oram] [Ben_Oram]