[Automatic manuf, services and enterprise-numbers update for 2011-03-20]

svn path=/trunk-1.2/; revision=36218

3 files changed, 233 insertions, 45 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index c747b0fbff..368e1bdce4 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-03-12)
+(last updated 2011-03-19)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -10543,8 +10543,8 @@ Decimal
       jwilliams&cti.ca
 2634
   Western Telematic, Inc.
-    Srikanth Sherman
-      sri&westtel.com
+    Anthony Barrera
+      anthonyb&wti.com
 2635
   ADTX
     Chris Jan Cortes
@@ -62043,9 +62043,9 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
     Rick Clark
       rick&aptare.com
 15623
-  Darryl Ross
+  Bachblue Pty Ltd t/a AFOYI
     Darryl Ross
-      darryl&fuzzitech.net
+      darryl&afoyi.com
 15624
   Skopeo LLC
     Vanson Samuel
@@ -147797,7 +147797,7 @@ Decentralization / Helenic Public Administra
       support&andone.co.jp
 37053
   MMR Network Management Science & Technology Co., Ltd 
-    ShiHaoQing
+    HaoQing Shi
       mr_shq&163.com
 37054
   AirP Systems LLC
@@ -149586,7 +149586,7 @@ Decentralization / Helenic Public Administra
 37500
   Schmid Industrieholding
     Thomas Brandner
-      t.brandner&wopfinger.baumit.com
+      iana&sih.co.at
 37501
   Progetto Archivio S.r.l.
     Massimo Nuvoli
@@ -149843,6 +149843,158 @@ Decentralization / Helenic Public Administra
   Everest Display Inc.
     Michael B. F. Wu
       michaelbfwu&everestdisplay.com.tw
+37565
+  Struck Innovative Systeme GmbH
+    Thorsten Fritzke
+      thorsten.fritzke&struck.de
+37566
+  Discovery Reply S.r.l.
+    Andrea Ceciarelli
+      a.ceciarelli&reply.it
+37567
+  Alliant Techsystems Inc.
+    Darren Hibbard
+      darren.hibbard&atk.com
+37568
+  Commend International GmbH
+    Johannes Helminger
+      j.helminger&commend.com
+37569
+  Vocative Ltd.
+    Dmitry Glukhov
+      gludminick&vocative.ru
+37570
+  ELFF Tech
+    Lonny Fairfield
+      lfairfie&wyoming.com
+37571
+  KVUC
+    Mik Helmich
+      mik&kvuc.dk
+37572
+  Panini s.p.a.
+    Massimo Gullotto
+      Massimo.Gullotto&panini.com
+37573
+  LightSoft Research Ltd.
+    Alexey Leontev
+      alex&lightsoft.ru
+37574
+  Alberta Distance Learning Centre
+    Arlen Baker
+      abaker&adlc.ca
+37575
+  Infobip LTD
+    Izabel Jelenic
+      izabel.jelenic&infobip.com
+37576
+  NovelSat
+    Guy Cohen
+      guy.c&novelsat.com
+37577
+  Branch of LLC "Tabak-Invest" Trade Center "Korona"
+    Mikhail Koren
+      mike.it&korona.by
+37578
+  Samworth Brothers Ltd
+    thomas wing
+      helpdesk&ginsters.co.uk
+37579
+  Synetrix Holdings Limited
+    John Shaw-Miller
+      john.shaw-miller&synetrix.co.uk
+37580
+  Chao-Inn elementary school
+    Chia-Hui Chen
+      mis&cies.tyc.edu.tw
+37581
+  Mika timing GmbH
+    Joerg Mika
+      joerg.mika&mikatiming.de
+37582
+  Theobroma Systems Design und Consulting GmbH
+    Dr. Philipp Tomsich
+      oid-admin&theobroma-systems.com
+37583
+  Surescripts, LLC
+    Pete Palmer
+      pete.palmer&surescripts.com
+37584
+  Gary Hawkins
+    Gary Hawkins
+      gary.hawkins&garyhawkins.me.uk
+37585
+  QDIAGNOSTICA
+    Ayuda Imagen
+      ayuda.imagen&diagnosticorecoletas.com
+37586
+  E-sektionens Teletekniska Avdelning
+    Anton Landberg
+      anton.landberg&gmail.com
+37587
+  QualVu, Inc.
+    Rodney D. Holm
+      rholm&qualvu.com
+37588
+  QingDao Easytelecom Co., Ltd.
+    Lin Guo
+      easytelecom&public.qd.sd.cn
+37589
+  Institut de l'Ebre
+    Sergi Tur Badenas
+      stur&iesebre.com
+37590
+  Meyer Burger Technology AG
+    Jonas Reusser
+      j.reusser&meyerburger.ch
+37591
+  Reggiani
+    Andrea Pagni
+      support&reggiani.it
+37592
+  Ev.-Luth. Brüdergemeinde Enger e.V.
+    Alexander Gebel
+      alex&elb-enger.de
+37593
+  Platform-a Arastirma Gelistirme Koordinasyon Hizmetleri A. S.
+    Ilhan Uncuoglu
+      ilhan.uncuoglu&platform-a.org
+37594
+  Netmining LLC
+    Cristian Ferencz
+      cristian.ferencz&netmining.com
+37595
+  Geomarine Ltd
+    Ian Macdonald
+      ianmac51&gmail.com
+37596
+  Agri-hitech LLC
+    Shigeru Makino
+      mac&agri-hitech.com
+37597
+  Decatur Hospital Authority dba Wise Regional Health System
+    Joe Arispe
+      jarispe&wiseregional.com
+37598
+  CipherCloud, Inc.
+    Pravin Kothari
+      pkothari&ciphercloud.com
+37599
+  Meontrust Inc.
+    Markku Mehtälä
+      markku&meontrust.com
+37600
+  ledeuns.org
+    Denis FONDRAS
+      contact&ledeuns.org
+37601
+  Xech S.r.l.
+    Marco Tiraboschi
+      mtiraboschi&xech.it
+37602
+  Spider Software GmbH
+    Michael Becker
+      pen&spider-software.net
 
 
 End of Document
diff --git a/manuf b/manuf
index 024c908132..0e723b57ed 100644
--- a/manuf
+++ b/manuf
@@ -1265,7 +1265,7 @@
 00:04:BA	KddMediaWi             # KDD Media Will Corporation
 00:04:BB	Bardac                 # Bardac Corporation
 00:04:BC	Giantec                # Giantec, Inc.
-00:04:BD	MotorolaBc             # Motorola BCS
+00:04:BD	MotorolaMo             # Motorola Mobility, Inc. 
 00:04:BE	Optxcon                # OptXCon, Inc.
 00:04:BF	Versalogic             # VersaLogic Corp.
 00:04:C0	Cisco                  # Cisco Systems, Inc.
@@ -1882,6 +1882,7 @@
 00:07:23	ElconSyste             # ELCON Systemtechnik GmbH
 00:07:24	Telemax                # Telemax Co., Ltd.
 00:07:25	BematechIn             # Bematech International Corp.
+00:07:26	ShenzhenGo             # Shenzhen Gongjin Electronics Co., Ltd.
 00:07:27	ZiHk                   # Zi Corporation (HK) Ltd.
 00:07:28	NeoTelecom             # Neo Telecom
 00:07:29	KistlerIns             # Kistler Instrumente AG
@@ -2111,7 +2112,7 @@
 00:08:0B	BirkaBpaIn             # Birka BPA Informationssystem AB
 00:08:0C	VdaElettro             # VDA Elettronica spa
 00:08:0D	Toshiba
-00:08:0E	MotorolaBc             # Motorola, BCS
+00:08:0E	MotorolaMo             # Motorola Mobility, Inc. 
 00:08:0F	ProximionF             # Proximion Fiber Optics AB
 00:08:10	KeyTechnol             # Key Technology, Inc.
 00:08:11	Voix                   # VOIX Corporation
@@ -2839,7 +2840,7 @@
 00:0B:03	TaekwangIn             # Taekwang Industrial Co., Ltd
 00:0B:04	Volktek                # Volktek Corporation
 00:0B:05	PacificBro             # Pacific Broadband Networks
-00:0B:06	MotorolaBc             # Motorola BCS
+00:0B:06	MotorolaMo             # Motorola Mobility, Inc.
 00:0B:07	VoxpathNet             # Voxpath Networks
 00:0B:08	PillarData             # Pillar Data Systems
 00:0B:09	IfoundrySi             # Ifoundry Systems Singapore
@@ -3318,7 +3319,7 @@
 00:0C:E2	Rolls-Royc             # Rolls-Royce
 00:0C:E3	OptionInte             # Option International N.V.
 00:0C:E4	NeurocomIn             # NeuroCom International, Inc.
-00:0C:E5	MotorolaBc             # Motorola BCS
+00:0C:E5	MotorolaMo             # Motorola Mobility, Inc.
 00:0C:E6	MeruNetwor             # Meru Networks Inc
 00:0C:E7	Mediatek               # MediaTek Inc.
 00:0C:E8	GuangzhouA             # GuangZhou AnJuBao Co., Ltd
@@ -3693,7 +3694,7 @@
 00:0E:59	SagemSa                # SAGEM SA
 00:0E:5A	Telefield              # TELEFIELD inc.
 00:0E:5B	Parkervisi             # ParkerVision - Direct2Data
-00:0E:5C	MotorolaBc             # Motorola BCS
+00:0E:5C	MotorolaMo             # Motorola Mobility, Inc.
 00:0E:5D	TriplePlay             # Triple Play Technologies A/S
 00:0E:5E	RaisecomTe             # Raisecom Technology
 00:0E:5F	Activ-Net              # activ-net GmbH & Co. KG
@@ -4016,7 +4017,7 @@
 00:0F:9C	Panduit                # Panduit Corp
 00:0F:9D	Displaylin             # DisplayLink (UK) Ltd
 00:0F:9E	Murrelektr             # Murrelektronik GmbH
-00:0F:9F	MotorolaBc             # Motorola BCS
+00:0F:9F	MotorolaMo             # Motorola Mobility, Inc.
 00:0F:A0	CanonKorea             # CANON KOREA BUSINESS SOLUTIONS INC.
 00:0F:A1	Gigabit                # Gigabit Systems Inc.
 00:0F:A2	DigitalPat             # Digital Path Networks
@@ -4394,7 +4395,7 @@
 00:11:17	Cesnet
 00:11:18	BlxIcDesig             # BLX IC Design Corp., Ltd.
 00:11:19	Solteras               # Solteras, Inc.
-00:11:1A	MotorolaBc             # Motorola BCS
+00:11:1A	MotorolaMo             # Motorola Mobility, Inc.
 00:11:1B	TargaDivL-             # Targa Systems Div L-3 Communications Canada
 00:11:1C	PleoraTech             # Pleora Technologies Inc.
 00:11:1D	Hectrix                # Hectrix Limited
@@ -4496,7 +4497,7 @@
 00:11:7D	ZmdAmerica             # ZMD America, Inc.
 00:11:7E	Progeny                # Progeny Inc.
 00:11:7F	NeotuneInf             # Neotune Information Technology Corporation,.LTD
-00:11:80	MotorolaBc             # Motorola BCS
+00:11:80	MotorolaMo             # Motorola Mobility, Inc.
 00:11:81	Interenerg             # InterEnergy Co.Ltd,
 00:11:82	ImiNorgren             # IMI Norgren Ltd
 00:11:83	DatalogicM             # Datalogic Mobile, Inc.
@@ -4542,7 +4543,7 @@
 00:11:AB	TrustableT             # TRUSTABLE TECHNOLOGY CO.,LTD.
 00:11:AC	SimtecElec             # Simtec Electronics
 00:11:AD	ShanghaiRu             # Shanghai Ruijie Technology
-00:11:AE	MotorolaBc             # Motorola BCS
+00:11:AE	MotorolaMo             # Motorola Mobility, Inc.
 00:11:AF	Medialink-             # Medialink-i,Inc
 00:11:B0	Fortelink              # Fortelink Inc.
 00:11:B1	Blueexpert             # BlueExpert Technology Corp.
@@ -4661,7 +4662,7 @@
 00:12:22	SkardinUk              # Skardin (UK) Ltd
 00:12:23	Pixim
 00:12:24	Nexql                  # NexQL Corporation
-00:12:25	MotorolaBc             # Motorola BCS
+00:12:25	MotorolaMo             # Motorola Mobility, Inc. 
 00:12:26	JapanDirex             # Japan Direx Corporation
 00:12:27	FranklinEl             # Franklin Electric Co., Inc.
 00:12:28	Data                   # Data Ltd.
@@ -4762,7 +4763,7 @@
 00:12:87	DigitalEve             # Digital Everywhere Unterhaltungselektronik GmbH
 00:12:88	2wire                  # 2Wire, Inc
 00:12:89	AdvanceSte             # Advance Sterilization Products
-00:12:8A	MotorolaBc             # Motorola BCS
+00:12:8A	MotorolaMo             # Motorola Mobility, Inc. 
 00:12:8B	SensoryNet             # Sensory Networks Inc
 00:12:8C	WoodwardGo             # Woodward Governor
 00:12:8D	StbDatense             # STB Datenservice GmbH
@@ -4825,7 +4826,7 @@
 00:12:C6	TgcAmerica             # TGC America, Inc
 00:12:C7	SecurayTec             # SECURAY Technologies Ltd.Co.
 00:12:C8	PerfectTec             # Perfect tech
-00:12:C9	MotorolaBc             # Motorola BCS
+00:12:C9	MotorolaMo             # Motorola Mobility, Inc. 
 00:12:CA	Mechatroni             # Mechatronic Brick Aps
 00:12:CB	Css                    # CSS Inc.
 00:12:CC	Bitatek                # Bitatek CO., LTD
@@ -5290,7 +5291,7 @@
 00:14:97	ZhiyuanEle             # ZHIYUAN Eletronics co.,ltd.
 00:14:98	VikingDesi             # Viking Design Technology
 00:14:99	Helicomm               # Helicomm Inc
-00:14:9A	MotorolaMo             # Motorola Mobile Devices Business
+00:14:9A	MotorolaMo             # Motorola Mobility, Inc. 
 00:14:9B	NokotaComm             # Nokota Communications, LLC
 00:14:9C	Hf                     # HF Company
 00:14:9D	SoundId                # Sound ID Inc.
@@ -5560,7 +5561,7 @@
 00:15:A5	Dci                    # DCI Co., Ltd.
 00:15:A6	DigitalEle             # Digital Electronics Products Ltd.
 00:15:A7	Robatech               # Robatech AG
-00:15:A8	MotorolaMo             # Motorola Mobile Devices
+00:15:A8	MotorolaMo             # Motorola Mobility, Inc.
 00:15:A9	KwangWooI&             # KWANG WOO I&C CO.,LTD
 00:15:AA	Rextechnik             # Rextechnik International Co.,
 00:15:AB	ProSound               # PRO CO SOUND INC
@@ -5765,7 +5766,7 @@
 00:16:72	ZenwayEnte             # Zenway enterprise ltd
 00:16:73	Bury                   # Bury GmbH & Co. KG
 00:16:74	EurocbPhil             # EuroCB (Phils.), Inc.
-00:16:75	MotorolaMd             # Motorola MDb
+00:16:75	MotorolaMo             # Motorola Mobility, Inc. 
 00:16:76	Intel                  # Intel Corporation
 00:16:77	Bihl+Wiede             # Bihl+Wiedemann GmbH
 00:16:78	ShenzhenBa             # SHENZHEN BAOAN GAOKE ELECTRONICS CO., LTD
@@ -5904,7 +5905,7 @@
 00:16:FD	JatyElectr             # Jaty Electronics
 00:16:FE	AlpsElectr             # Alps Electric Co., Ltd
 00:16:FF	WaminOptoc             # Wamin Optocomm Mfg Corp
-00:17:00	MotorolaMd             # Motorola MDb
+00:17:00	MotorolaMo             # Motorola Mobility, Inc.
 00:17:01	Kde                    # KDE, Inc.
 00:17:02	OsungMidic             # Osung Midicom Co., Ltd
 00:17:03	MosdanInte             # MOSDAN Internation Co.,Ltd
@@ -6036,7 +6037,7 @@
 00:17:81	GreystoneD             # Greystone Data System, Inc.
 00:17:82	Lobenn                 # LoBenn Inc.
 00:17:83	TexasInstr             # Texas Instruments
-00:17:84	MotorolaMo             # Motorola Mobile Devices
+00:17:84	MotorolaMo             # Motorola Mobility, Inc.
 00:17:85	SparrElect             # Sparr Electronics Ltd
 00:17:86	Wisembed
 00:17:87	BrotherBro             # Brother, Brother & Sons ApS
@@ -6130,7 +6131,7 @@
 00:17:DF	Cisco                  # Cisco Systems
 00:17:E0	Cisco                  # Cisco Systems
 00:17:E1	DacosTechn             # DACOS Technologies Co., Ltd.
-00:17:E2	MotorolaMo             # Motorola Mobile Devices
+00:17:E2	MotorolaMo             # Motorola Mobility, Inc. 
 00:17:E3	TexasInstr             # Texas Instruments
 00:17:E4	TexasInstr             # Texas Instruments
 00:17:E5	TexasInstr             # Texas Instruments
@@ -6197,7 +6198,7 @@
 00:18:22	CecTelecom             # CEC TELECOM CO.,LTD.
 00:18:23	DeltaElect             # Delta Electronics, Inc.
 00:18:24	KimaldiEle             # Kimaldi Electronics, S.L.
-00:18:25	Wavion                 # Wavion LTD
+00:18:25	Private
 00:18:26	CaleAccess             # Cale Access AB
 00:18:27	NecUnified             # NEC UNIFIED SOLUTIONS NEDERLAND B.V.
 00:18:28	E2vTechnol             # e2v technologies (UK) ltd.
@@ -6460,7 +6461,7 @@
 00:19:29	2m2bMontad             # 2M2B Montadora de Maquinas Bahia Brasil LTDA
 00:19:2A	AntiopeAss             # Antiope Associates
 00:19:2B	AclaraRf               # Aclara RF Systems Inc.
-00:19:2C	MotorolaMo             # Motorola Mobile Devices
+00:19:2C	MotorolaMo             # Motorola Mobility, Inc. 
 00:19:2D	Nokia                  # Nokia Corporation
 00:19:2E	SpectralIn             # Spectral Instruments, Inc.
 00:19:2F	Cisco                  # Cisco Systems
@@ -6608,7 +6609,7 @@
 00:19:BD	NewMediaLi             # New Media Life
 00:19:BE	AltaiTechn             # Altai Technologies Limited
 00:19:BF	CitiwayTec             # Citiway technology Co.,ltd
-00:19:C0	MotorolaMo             # Motorola Mobile Devices
+00:19:C0	MotorolaMo             # Motorola Mobility, Inc. 
 00:19:C1	AlpsElectr             # Alps Electric Co., Ltd
 00:19:C2	EquustekSo             # Equustek Solutions, Inc.
 00:19:C3	Qualitrol
@@ -6699,7 +6700,7 @@
 00:1A:18	AdvancedSi             # Advanced Simulation Technology inc.
 00:1A:19	ComputerEn             # Computer Engineering Limited
 00:1A:1A	GentexCorp             # Gentex Corporation/Electro-Acoustic Products
-00:1A:1B	MotorolaMo             # Motorola Mobile Devices
+00:1A:1B	MotorolaMo             # Motorola Mobility, Inc. 
 00:1A:1C	Gt&TEngine             # GT&T Engineering Pte Ltd
 00:1A:1D	PchomeOnli             # PChome Online Inc.
 00:1A:1E	ArubaNetwo             # Aruba Networks
@@ -6791,7 +6792,7 @@
 00:1A:74	ProcareInt             # Procare International Co
 00:1A:75	SonyEricss             # Sony Ericsson Mobile Communications
 00:1A:76	SdtInforma             # SDT information Technology Co.,LTD.
-00:1A:77	MotorolaMo             # Motorola Mobile Devices
+00:1A:77	MotorolaMo             # Motorola Mobility, Inc. 
 00:1A:78	Ubtos
 00:1A:79	Telecomuni             # TELECOMUNICATION TECHNOLOGIES LTD.
 00:1A:7A	LismoreIns             # Lismore Instruments Limited
@@ -6891,7 +6892,7 @@
 00:1A:D8	Alsteraero             # AlsterAero GmbH
 00:1A:D9	Internatio             # International Broadband Electric Communications, Inc.
 00:1A:DA	Biz-2-Me               # Biz-2-Me Inc.
-00:1A:DB	MotorolaMo             # Motorola Mobile Devices
+00:1A:DB	MotorolaMo             # Motorola Mobility, Inc.
 00:1A:DC	NokiaDanma             # Nokia Danmark A/S
 00:1A:DD	Pepwave                # PePWave Ltd
 00:1A:DE	MotorolaMo             # Motorola Mobility, Inc.
@@ -7010,7 +7011,7 @@
 00:1B:4F	Avaya                  # Avaya Inc.
 00:1B:50	NizhnyNovg             # Nizhny Novgorod Factory named after M.Frunze, FSUE (NZiF)
 00:1B:51	VectorTech             # Vector Technology Corp.
-00:1B:52	MotorolaMo             # Motorola Mobile Devices
+00:1B:52	MotorolaMo             # Motorola Mobility, Inc. 
 00:1B:53	Cisco                  # Cisco Systems
 00:1B:54	Cisco                  # Cisco Systems
 00:1B:55	HurcoAutom             # Hurco Automation Ltd.
@@ -7202,7 +7203,7 @@
 00:1C:0F	Cisco                  # Cisco Systems
 00:1C:10	Cisco-Link             # Cisco-Linksys, LLC
 00:1C:11	MotorolaMo             # Motorola Mobility, Inc.
-00:1C:12	MotorolaMo             # Motorola Mobile Devices
+00:1C:12	MotorolaMo             # Motorola Mobility, Inc.
 00:1C:13	OptsysTech             # OPTSYS TECHNOLOGY CO., LTD.
 00:1C:14	Vmware                 # VMware, Inc
 00:1C:15	Txp                    # TXP Corporation
@@ -7377,7 +7378,7 @@
 00:1C:BE	Nintendo               # Nintendo Co., Ltd.
 00:1C:BF	IntelCorpo             # Intel Corporate
 00:1C:C0	IntelCorpo             # Intel Corporate
-00:1C:C1	MotorolaMo             # Motorola Mobile Devices
+00:1C:C1	MotorolaMo             # Motorola Mobility, Inc. 
 00:1C:C2	PartIiRese             # Part II Research, Inc.
 00:1C:C3	Pace                   # Pace plc
 00:1C:C4	HewlettPac             # Hewlett Packard
@@ -7521,7 +7522,7 @@
 00:1D:4E	TcmMobileL             # TCM Mobile LLC
 00:1D:4F	AppleCompu             # Apple Computer Inc.
 00:1D:50	SpinetixSa             # SPINETIX SA
-00:1D:51	GeEnergy               # GE Energy
+00:1D:51	BabcockWil             # Babcock & Wilcox Power Generation Group, Inc
 00:1D:52	DefzoneBV              # Defzone B.V.
 00:1D:53	S&OElectro             # S&O Electronics (Malaysia) Sdn. Bhd.
 00:1D:54	SunnicTech             # Sunnic Technology & Merchandise INC.
@@ -7630,7 +7631,7 @@
 00:1D:BB	DynamicSys             # Dynamic System Electronics Corp.
 00:1D:BC	Nintendo               # Nintendo Co., Ltd.
 00:1D:BD	Versamed               # Versamed Inc.
-00:1D:BE	MotorolaMo             # Motorola Mobile Devices
+00:1D:BE	MotorolaMo             # Motorola Mobility, Inc. 
 00:1D:BF	RadiientTe             # Radiient Technologies, Inc.
 00:1D:C0	EnphaseEne             # Enphase Energy
 00:1D:C1	AudinatePt             # Audinate Pty L
@@ -7837,7 +7838,7 @@
 00:1E:8A	Ecopy                  # eCopy, Inc
 00:1E:8B	InfraAcces             # Infra Access Korea Co., Ltd.
 00:1E:8C	AsustekCom             # ASUSTek COMPUTER INC.
-00:1E:8D	MotorolaMo             # Motorola Mobile Devices
+00:1E:8D	MotorolaMo             # Motorola Mobility, Inc.
 00:1E:8E	Hunkeler               # Hunkeler AG
 00:1E:8F	Canon                  # CANON INC.
 00:1E:90	Elitegroup             # Elitegroup Computer Systems Co
@@ -8078,7 +8079,7 @@
 00:1F:7B	Technexion             # TechNexion Ltd.
 00:1F:7C	WitelcomAs             # Witelcom AS
 00:1F:7D	EmbeddedWi             # embedded wireless GmbH
-00:1F:7E	MotorolaMo             # Motorola Mobile Devices
+00:1F:7E	MotorolaMo             # Motorola Mobility, Inc.
 00:1F:7F	Phabrix                # Phabrix Limited
 00:1F:80	LucasHoldi             # Lucas Holding bv
 00:1F:81	AccelSemic             # Accel Semiconductor Corp
@@ -8518,7 +8519,7 @@
 00:21:33	BuildingB              # Building B, Inc
 00:21:34	Brandywine             # Brandywine Communications
 00:21:35	Alcatel-Lu             # ALCATEL-LUCENT
-00:21:36	MotorolaMo             # Motorola Mobile Devices business (MDb)
+00:21:36	MotorolaMo             # Motorola Mobility, Inc.
 00:21:37	BayControl             # Bay Controls, LLC
 00:21:38	Cepheid
 00:21:39	Escherlogi             # Escherlogic Inc.
@@ -8900,7 +8901,7 @@
 00:22:B1	Elbit                  # Elbit Systems
 00:22:B2	4rfCommuni             # 4RF Communications Ltd
 00:22:B3	SeiSPA                 # Sei S.p.A.
-00:22:B4	MotorolaMo             # Motorola Mobile Devices
+00:22:B4	MotorolaMo             # Motorola Mobility, Inc.
 00:22:B5	Novita
 00:22:B6	SuperflowT             # Superflow Technologies Group
 00:22:B7	GssGrundig             # GSS Grundig SAT-Systems GmbH
@@ -14083,7 +14084,7 @@
 00:50:C2:D2:50:00/36	VafInstrum             # VAF Instruments BV
 00:50:C2:D2:60:00/36	Rch
 00:50:C2:D2:70:00/36	FrSauter               # Fr.Sauter AG
-00:50:C2:D2:80:00/36	Digitale-A             # Digitale-Analoge COMponenten West Electronic Vertriebs GmbH
+00:50:C2:D2:80:00/36	DigitaleAn             # Digitale Analoge COMponenten West Electronic Vertriebs GmbH
 00:50:C2:D2:90:00/36	AxibleTech             # Axible Technologies
 00:50:C2:D2:A0:00/36	Millennium             # Millennium Electronics Pty.Ltd.
 00:50:C2:D2:B0:00/36	VideoTechL             # Video Tech Laboratories, Inc.
@@ -14275,6 +14276,11 @@
 00:50:C2:DE:60:00/36	FrSauter               # Fr. Sauter AG
 00:50:C2:DE:70:00/36	Elan                   # Elan Systems 
 00:50:C2:DE:80:00/36	VisualProd             # Visual Productions
+00:50:C2:DE:90:00/36	DigataleAn             # Digatale Analoge COMponenten West Electronic Vertrieb GmbH
+00:50:C2:DE:A0:00/36	Cerner                 # Cerner Corporation
+00:50:C2:DE:B0:00/36	RuwischKol             # Ruwisch & Kollegen GmbH
+00:50:C2:DE:C0:00/36	Vendnovati             # VendNovation LLC
+00:50:C2:DE:D0:00/36	LeeLaser               # Lee Laser
 00:50:C4	Imd
 00:50:C5	AdsTechnol             # ADS Technologies, Inc
 00:50:C6	LoopTeleco             # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -16263,6 +16269,7 @@
 04:C8:80	Samtec                 # Samtec Inc
 04:DD:4C	Ipblaze
 04:E0:C4	Triumph-Ad             # TRIUMPH-ADLER AG
+04:E1:C8	ImsSolu�             # IMS Solu��es em Energia Ltda.
 04:E2:F8	AepSrl                 # AEP srl
 04:E5:48	CohdaWirel             # Cohda Wireless Pty Ltd
 04:E6:62	Acroname               # Acroname Inc.
@@ -16514,6 +16521,7 @@
 10:E6:AE	SourceTech             # Source Technologies, LLC
 10:E8:EE	Phasespace
 11:00:AA	Private
+14:07:08	Private
 14:07:E0	Abrantix               # Abrantix AG
 14:14:4B	FujianStar             # FUJIAN STAR-NET COMMUNICATION CO.,LTD
 14:1B:BD	Volex                  # Volex Inc.
@@ -16562,6 +16570,7 @@
 18:B4:30	NestLabs               # Nest Labs Inc.
 18:B7:9E	Invoxia
 18:C0:86	Broadcom               # Broadcom Corporation
+18:D0:71	DasanSmc               # DASAN SMC, Inc.
 18:E2:88	SttCondigi             # STT Condigi
 18:E7:F4	Apple
 18:EF:63	Cisco                  # Cisco Systems
@@ -16570,8 +16579,9 @@
 1C:06:56	Idy                    # IDY Corporation
 1C:0F:CF	SyproOptic             # Sypro Optics GmbH
 1C:12:9D	IeeePesPsr             # IEEE PES PSRC/SUB     
-1C:14:48	MotorolaCh             # Motorola CHS
+1C:14:48	MotorolaMo             # Motorola Mobility, Inc.
 1C:17:D3	Cisco                  # Cisco Systems
+1C:18:4A	ShenzhenRi             # ShenZhen RicherLink Technologies Co.,LTD
 1C:19:DE	Eyevis                 # eyevis GmbH
 1C:1D:67	HuaweiDevi             # Huawei Device Co., Ltd
 1C:33:4D	ItsTelecom             # ITS Telecom
@@ -16599,6 +16609,7 @@
 20:05:E8	Ooo"Inprom             # OOO "InProMedia"
 20:0A:5E	XiangshanG             # Xiangshan Giant Eagle Technology Developing co.,LTD
 20:12:57	MostLuckyT             # Most Lucky Trading Ltd
+20:13:E0	SamsungEle             # Samsung Electronics Co.,Ltd
 20:21:A5	LgElectron             # LG Electronics Inc
 20:2B:C1	HuaweiDevi             # Huawei Device Co., Ltd
 20:2C:B7	KongYueEle             # Kong Yue Electronics & Information Industry (Xinhui) Ltd.
@@ -16617,6 +16628,7 @@
 20:AA:25	Ip-NetLlc              # IP-NET LLC
 20:B0:F7	Enclustra              # Enclustra GmbH
 20:B3:99	Enterasys
+20:B7:C0	OmicronEle             # Omicron electronics GmbH
 20:BF:DB	Dvl
 20:CF:30	AsustekCom             # ASUSTek COMPUTER INC.
 20:D5:AB	KoreaInfoc             # Korea Infocom Co.,Ltd.
@@ -16799,6 +16811,7 @@
 3C:5F:01	Synerchip              # Synerchip Co., Ltd.
 3C:62:00	SamsungEle             # Samsung electronics CO., LTD
 3C:62:78	ShenzhenJe             # SHENZHEN JETNET TECHNOLOGY CO.,LTD.
+3C:67:2C	Sciovid                # Sciovid Inc.
 3C:74:37	Rim
 3C:75:4A	MotorolaMo             # Motorola Mobility, Inc.
 3C:8B:FE	SamsungEle             # Samsung Electronics
@@ -16818,6 +16831,7 @@
 40:12:E4	Compass-Eo             # Compass-EOS
 40:13:D9	GlobalEs               # Global ES
 40:15:97	ProtectAme             # Protect America, Inc.
+40:16:9F	Tp-LinkTec             # TP-LINK TECHNOLOGIES CO., LTD.
 40:18:D7	WyleTeleme             # Wyle Telemetry and Data Systems
 40:1D:59	BiometricA             # Biometric Associates, LP
 40:22:ED	DigitalPro             # Digital Projection Ltd
@@ -16995,6 +17009,7 @@
 54:89:98	HuaweiTech             # HUAWEI TECHNOLOGIES CO.,LTD
 54:92:BE	SamsungEle             # Samsung Electronics Co.,Ltd
 54:9A:16	UzushioEle             # Uzushio Electric Co.,Ltd.
+54:9B:12	SamsungEle             # Samsung Electronics
 54:A5:1B	HuaweiDevi             # Huawei Device Co., Ltd
 54:B6:20	SuhdolE&C              # SUHDOL E&C Co.Ltd.
 54:D4:6F	CiscoSpvtg             # Cisco SPVTG
@@ -17028,6 +17043,7 @@
 58:DB:8D	Fast                   # Fast Co., Ltd.
 58:E4:76	CentronCom             # CENTRON COMMUNICATIONS TECHNOLOGIES FUJIAN CO.,LTD
 58:E7:47	Deltanet               # Deltanet AG
+58:E8:08	Autonics               # AUTONICS CORPORATION
 58:EE:CE	IconTime               # Icon Time Systems
 58:F6:7B	XiaMenUnio             # Xia Men UnionCore Technology LTD.
 58:F6:BF	KyotoUnive             # Kyoto University
@@ -17375,8 +17391,11 @@
 80:3B:9A	Ghe-CesEle             # ghe-ces electronic ag
 80:4F:58	Thinkeco               # ThinkEco, Inc.
 80:50:1B	Nokia                  # Nokia Corporation
+80:58:C5	NovatecKom             # NovaTec Kommunikationstechnik GmbH
+80:64:59	Nimbus                 # Nimbus Inc.
 80:65:E9	Benq                   # BenQ Corporation
 80:66:29	PrescopeTe             # Prescope Technologies CO.,LTD.
+80:6C:BC	NetNewElec             # NET New Electronic Technology GmbH
 80:71:1F	JuniperNet             # Juniper Networks
 80:7D:1B	Neosystem              # Neosystem Co. Ltd.
 80:81:A5	TongqingCo             # TONGQING COMMUNICATION EQUIPMENT (SHENZHEN) Co.,Ltd
@@ -17419,7 +17438,6 @@
 88:25:2C	ArcadyanTe             # Arcadyan Technology Corporation
 88:41:C1	OrbisatDaA             # ORBISAT DA AMAZONIA IND E AEROL SA
 88:43:E1	Cisco                  # Cisco Systems
-88:44:4A	ShenzhenGo             # Shenzhen Gongjin Electronics Co., Ltd.
 88:4B:39	SiemensHea             # Siemens AG, Healthcare Sector
 88:53:2E	IntelCorpo             # Intel Corporate
 88:86:A0	SimtonTech             # Simton Technologies, Ltd.
@@ -17444,6 +17462,7 @@
 88:E0:A0	ShenzhenVi             # Shenzhen VisionSTOR Technologies Co., Ltd
 88:ED:1C	CudoCommun             # Cudo Communication Co., Ltd.
 88:FD:15	Lineeye                # LINEEYE CO., LTD
+8C:11:CB	AbusSecuri             # ABUS Security-Center GmbH & Co. KG
 8C:1F:94	RfSurgical             # RF Surgical System Inc. 
 8C:27:8A	Vocollect              # Vocollect Inc
 8C:44:35	ShanghaiBr             # Shanghai BroadMobi Communication Technology Co., Ltd.
@@ -17463,6 +17482,7 @@
 8C:7C:B5	HonHaiPrec             # Hon Hai Precision Ind. Co.,Ltd.
 8C:7C:FF	BrocadeCom             # Brocade Communications Systems, Inc.
 8C:84:01	Private
+8C:89:A5	Micro-Star             # Micro-Star INT'L CO., LTD
 8C:90:D3	AlcatelLuc             # Alcatel Lucent
 8C:92:36	AusLinxTec             # Aus.Linx Technology Co., Ltd.
 8C:A0:48	BeijingNet             # Beijing NeTopChip Technology Co.,LTD
@@ -17536,6 +17556,7 @@
 94:DD:3F	A+VLinkTec             # A+V Link Technologies, Corp.
 94:E2:26	DOrtizCons             # D. ORtiz Consulting, LLC
 94:E7:11	XirkaDamaP             # Xirka Dama Persada PT
+94:E8:48	FyldeMicro             # FYLDE MICRO LTD
 94:F6:92	Geminico               # Geminico co.,Ltd.
 94:F7:20	TianjinDev             # Tianjin Deviser Electronics Instrument Co., Ltd
 94:FD:1D	Wherewhen              # WhereWhen Corp
@@ -17635,6 +17656,7 @@ A4:33:D1	FibrlinkCo             # Fibrlink Communications Co.,Ltd.
 A4:38:FC	PlasticLog             # Plastic Logic
 A4:50:55	BuswareDe              # busware.de
 A4:56:1B	Mcot                   # MCOT Corporation
+A4:5A:1C	Smart-Elec             # smart-electronic GmbH
 A4:5C:27	Nintendo               # Nintendo Co., Ltd.
 A4:67:06	Apple                  # Apple Inc
 A4:79:E4	Klinfo                 # KLINFO Corp
@@ -17705,6 +17727,7 @@ AC:44:F2	Revolabs               # Revolabs Inc
 AC:4F:FC	Svs-Vistek             # SVS-VISTEK GmbH
 AC:51:35	MpiTech                # MPI TECH
 AC:58:3B	HumanAssem             # Human Assembler, Inc.
+AC:5E:8C	Utillink
 AC:61:23	Drivven                # Drivven, Inc.
 AC:67:06	RuckusWire             # Ruckus Wireless
 AC:6F:4F	Enspert                # Enspert Inc
@@ -17733,6 +17756,7 @@ AC:EA:6A	GenixInfoc             # GENIX INFOCOMM CO., LTD.
 AC:F9:7E	Elesys                 # ELESYS INC.
 B0:1B:7C	OntrolAS               # Ontrol A.S.
 B0:38:29	Siliconwar             # Siliconware Precision Industries Co., Ltd.
+B0:48:7A	Tp-LinkTec             # TP-LINK TECHNOLOGIES CO., LTD.
 B0:51:8E	HollTechno             # Holl technology CO.Ltd.
 B0:5B:1F	ThermoFish             # THERMO FISHER SCIENTIFIC S.P.A.
 B0:65:63	ShanghaiRa             # Shanghai Railway Communication Factory
@@ -17806,6 +17830,7 @@ B8:B1:C7	Bt&Com                 # BT&COM CO.,LTD
 B8:BA:68	XiAnJizhon             # Xi'an Jizhong Digital Communication Co.,Ltd
 B8:BA:72	Cynove
 B8:BE:BF	Cisco                  # Cisco Systems
+B8:C7:16	FiberhomeT             # Fiberhome Telecommunication Technologies Co.,LTD
 B8:D0:6F	GuangzhouH             # GUANGZHOU HKUST FOK YING TUNG RESEARCH INSTITUTE
 B8:D4:9D	MSevenSyst             # M Seven System Ltd.
 B8:E5:89	PayterBv               # Payter BV
@@ -17991,6 +18016,7 @@ D0:27:88	HonHaiPrec             # Hon Hai Precision Ind.Co.Ltd
 D0:37:61	TexasInstr             # Texas Instruments
 D0:57:4C	Cisco                  # Cisco Systems
 D0:58:75	ActiveCont             # Active Control Technology Inc.
+D0:66:7B	SamsungEle             # Samsung Electronics Co., LTD
 D0:75:BE	RenoA&Amp;             # Reno A&E
 D0:7D:E5	ForwardPay             # Forward Pay Systems, Inc.
 D0:89:99	Apcon                  # APCON, Inc.
@@ -18012,6 +18038,7 @@ D4:11:D6	Shotspotte             # ShotSpotter, Inc.
 D4:12:96	AnobitTech             # Anobit Technologies Ltd.
 D4:1F:0C	TviVisionO             # TVI Vision Oy
 D4:28:B2	Iobridge               # ioBridge, Inc.
+D4:2C:3D	SkyLightDi             # Sky Light Digital Limited
 D4:3D:67	CarmaIndus             # Carma Industries Inc.
 D4:4C:24	Vuppalamri             # Vuppalamritha Magnetic Components LTD
 D4:4C:A7	Informtekh             # Informtekhnika & Communication, LLC
@@ -18080,6 +18107,7 @@ D8:E3:AE	CirtecMedi             # CIRTEC MEDICAL SYSTEMS
 D8:E7:2B	OnpathTech             # OnPATH Technologies
 D8:FE:8F	Idfone                 # IDFone Co., Ltd.
 DC:02:65	MeditechKf             # Meditech Kft
+DC:05:ED	NabtescoAu             # Nabtesco Automotive Corporation
 DC:07:C1	HangzhouQi             # HangZhou QiYang Technology Co.,Ltd.
 DC:16:A2	MedtronicD             # Medtronic Diabetes
 DC:1D:9F	UBTech                 # U & B tech
@@ -18358,6 +18386,7 @@ FC:61:98	NecPersona             # NEC Personal Products, Ltd
 FC:68:3E	DirectedPe             # Directed Perception, Inc
 FC:75:E6	Handreamne             # Handreamnet
 FC:7C:E7	FciUsaLlc              # FCI USA LLC
+FC:83:29	TreiTechni             # Trei technics
 FC:8E:7E	PaceFrance             # Pace France
 FC:A1:3E	SamsungEle             # Samsung Electronics
 FC:A8:41	Avaya                  # Avaya, Inc
diff --git a/services b/services
index 53ba5aefcc..49bbbfefaa 100644
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 
 PORT NUMBERS
 
-(last updated 2011-03-10)
+(last updated 2011-03-16)
 
 The port numbers are divided into three ranges: the Well Known Ports,
 the Registered Ports, and the Dynamic and/or Private Ports.
@@ -13722,7 +13722,14 @@ vision_server   6672/udp   vision_server
 vision_elmd     6673/tcp   vision_elmd
 vision_elmd     6673/udp   vision_elmd
 #                          Chris Kramer <CKramer&gis.shl.com>
-#               6674-6686  Unassigned
+#               6674-6677  Unassigned
+vfbp            6678/tcp   Viscount Freedom Bridge Protocol
+vfbp-disc       6678/udp   Viscount Freedom Bridge Discovery
+#                          Chris MacDonald <chris&viscount.com> 16 March 2011
+osaut           6679/tcp   Osorno Automation
+osaut           6679/udp   Osorno Automation
+#                          Peter Hombach <p.hombach&osorno.ca> 16 March 2011
+#               6680-6686  Unassigned
 clever-ctrace   6687/tcp   CleverView for cTrace Message Service
 #                          David Cheng <davec&aesclever.com> 01 February 2010
 #               6687/udp   Reserved