--- /386/include/ape/math.h	Wed Jun 16 19:19:45 2004
+++ /386/include/ape/math.h	Thu Feb 28 23:09:16 2013
@@ -15,6 +15,7 @@
 extern double atan(double);
 extern double atan2(double, double);
 extern double cos(double);
+extern double hypot(double, double);
 extern double sin(double);
 extern double tan(double);
 extern double cosh(double);
--- /lib/oui	Thu Nov  1 18:57:25 2012
+++ /lib/oui	Fri Mar  1 01:36:33 2013
@@ -876,7 +876,7 @@
 00035c saint song corp.
 00035d bosung hi-net co., ltd.
 00035e metropolitan area networks, inc.
-00035f prueftechnik condition monitoring gmbh & co. kg
+00035f prüftechnik condition monitoring gmbh & co. kg
 000360 pac interactive technology, inc.
 000361 widcomm, inc.
 000362 vodtel communications, inc.
@@ -1438,7 +1438,7 @@
 00058e flextronics international gmbh & co. nfg. kg
 00058f clcsoft co.
 000590 swissvoice ltd.
-000591 active silicon ltd.
+000591 active silicon ltd
 000592 pultek corp.
 000593 grammar engine inc.
 000594 ixxat automation gmbh
@@ -1449,7 +1449,7 @@
 000599 drs test and energy management or drs-tem
 00059a cisco systems, inc.
 00059b cisco systems, inc.
-00059c kleinknecht gmbh, ing. buero
+00059c kleinknecht gmbh, ing. büro
 00059d daniel computing systems, inc.
 00059e zinwell corporation
 00059f yotta networks, inc.
@@ -1536,7 +1536,7 @@
 0005f0 satec
 0005f1 vrcom, inc.
 0005f2 power r, inc.
-0005f3 weboyn
+0005f3 webyn
 0005f4 system base co., ltd.
 0005f5 oyo geospace
 0005f6 young chang co. ltd.
@@ -1608,7 +1608,7 @@
 000638 sungjin c&c co., ltd.
 000639 newtec
 00063a dura micro, inc.
-00063b arcturus networks, inc.
+00063b arcturus networks inc.
 00063c intrinsyc europe ltd
 00063d microwave data systems inc.
 00063e opthos inc.
@@ -1637,7 +1637,7 @@
 000655 yipee, inc.
 000656 tactel ab
 000657 market central, inc.
-000658 helmut fischer gmbh institut für elektronik und messtechnik
+000658 helmut fischer gmbh institut für elektronik und messtechnik
 000659 eal (apeldoorn) b.v.
 00065a strix systems
 00065b dell computer corp.
@@ -1715,7 +1715,7 @@
 0006a3 bitran corporation
 0006a4 innowell corp.
 0006a5 pinon corp.
-0006a6 artistic licence (uk) ltd
+0006a6 artistic licence engineering ltd
 0006a7 primarion
 0006a8 kc technology, inc.
 0006a9 universal instruments corp.
@@ -1795,7 +1795,7 @@
 0006f3 accelight networks
 0006f4 prime electronics & satellitics inc.
 0006f5 alps co,. ltd.
-0006f6 cisco systems
+0006f6 cisco systems, inc.
 0006f7 alps electric co,. ltd.
 0006f8 cpu technology, inc.
 0006f9 mitsui zosen systems research inc.
@@ -1818,8 +1818,8 @@
 00070a unicom automation co., ltd.
 00070b novabase sgps, sa
 00070c sva-intrusion.com co. ltd.
-00070d cisco systems inc.
-00070e cisco systems inc.
+00070d cisco systems, inc.
+00070e cisco systems, inc.
 00070f fujant, inc.
 000710 adax, inc.
 000711 acterna
@@ -1832,7 +1832,7 @@
 000718 icantek co., ltd.
 000719 mobiis co., ltd.
 00071a finedigital inc.
-00071b cdv americas ltd
+00071b cdvi americas ltd
 00071c at&t fixed wireless services
 00071d satelsa sistemas y aplicaciones de telecomunicaciones, s.a.
 00071e tri-m engineering / nupak dev. corp.
@@ -1930,15 +1930,15 @@
 00077a infoware system co., ltd.
 00077b millimetrix broadband networks
 00077c westermo teleindustri ab
-00077d cisco systems
+00077d cisco systems, inc.
 00077e elrest gmbh
 00077f j communications co., ltd.
 000780 bluegiga technologies oy
 000781 itron inc.
 000782 oracle corporation
 000783 syncom network, inc.
-000784 cisco systems inc.
-000785 cisco systems inc.
+000784 cisco systems, inc.
+000785 cisco systems, inc.
 000786 wireless networks inc.
 000787 idea system co., ltd.
 000788 clipcomm, inc.
@@ -1951,7 +1951,7 @@
 00078f emkay innovative products
 000790 tri-m technologies (s) limited
 000791 international data communications, inc.
-000792 suetron electronic gmbh
+000792 sütron electronic gmbh
 000793 shin satellite public company limited
 000794 simple devices, inc.
 000795 elitegroup computer system co. (ecs)
@@ -1984,8 +1984,8 @@
 0007b0 office details, inc.
 0007b1 equator technologies
 0007b2 transaccess s.a.
-0007b3 cisco systems inc.
-0007b4 cisco systems inc.
+0007b3 cisco systems, inc.
+0007b4 cisco systems, inc.
 0007b5 any one wireless ltd.
 0007b6 telecom technology ltd.
 0007b7 samurai ind. prods eletronicos ltda
@@ -2013,7 +2013,7 @@
 0007cd nmtel co., ltd.
 0007ce cabletime limited
 0007cf anoto ab
-0007d0 automat engenharia de automaoa ltda.
+0007d0 automat engenharia de automação ltda.
 0007d1 spectrum signal processing inc.
 0007d2 logopak systeme
 0007d3 stork prints b.v.
@@ -2040,8 +2040,8 @@
 0007e8 edgewave
 0007e9 intel corporation
 0007ea massana, inc.
-0007eb cisco systems inc.
-0007ec cisco systems inc.
+0007eb cisco systems, inc.
+0007ec cisco systems, inc.
 0007ed altera corporation
 0007ee telco informationssysteme gmbh
 0007ef lockheed martin tactical systems
@@ -2093,11 +2093,11 @@
 00081d ipsil, incorporated
 00081e repeatit ab
 00081f pou yuen tech corp. ltd.
-000820 cisco systems inc.
-000821 cisco systems inc.
+000820 cisco systems, inc.
+000821 cisco systems, inc.
 000822 inpro comm
 000823 texa corp.
-000824 copitrak inc
+000824 nuance document imaging
 000825 acme packet
 000826 colorado med tech
 000827 adb broadband italia
@@ -2108,9 +2108,10 @@
 00082c homag ag
 00082d indus teqsite private limited
 00082e multitone electronics plc
-00082f cisco systems
-000830 cisco systems
-000831 cisco systems
+00082f cisco systems, inc.
+000830 cisco systems, inc.
+000831 cisco systems, inc.
+000832 cisco
 00084e divergenet, inc.
 00084f qualstar corporation
 000850 arizona instrument corp.
@@ -2158,7 +2159,7 @@
 00087a wipotec gmbh
 00087b rtx telecom a/s
 00087c cisco systems, inc.
-00087d cisco systems inc.
+00087d cisco systems, inc.
 00087e bon electro-telecom inc.
 00087f spaun electronic gmbh & co. kg
 000880 broadtel canada communications inc.
@@ -2166,7 +2167,7 @@
 000882 sigma corporation
 000883 hewlett-packard company
 000884 index braille ab
-000885 ems dr. thomas wuensche
+000885 ems dr. thomas wünsche
 000886 hansung teliann, inc.
 000887 maschinenfabrik reinhausen gmbh
 000888 oullim information technology inc,.
@@ -2196,8 +2197,8 @@
 0008a0 stotz feinmesstechnik gmbh
 0008a1 cnet technology inc.
 0008a2 adi engineering, inc.
-0008a3 cisco systems
-0008a4 cisco systems
+0008a3 cisco systems, inc.
+0008a4 cisco systems, inc.
 0008a5 peninsula systems inc.
 0008a6 multiware & image co., ltd.
 0008a7 ilogic inc.
@@ -2227,7 +2228,7 @@
 0008bf aptus elektronik ab
 0008c0 asa systems
 0008c1 avistar communications corporation
-0008c2 cisco systems
+0008c2 cisco systems, inc.
 0008c3 contex a/s
 0008c4 hikari co.,ltd.
 0008c5 liontech co., ltd.
@@ -2259,8 +2260,8 @@
 0008df alistel inc.
 0008e0 ato technology ltd.
 0008e1 barix ag
-0008e2 cisco systems
-0008e3 cisco systems
+0008e2 cisco systems, inc.
+0008e3 cisco systems, inc.
 0008e4 envenergy inc
 0008e5 idk corporation
 0008e6 littlefeet
@@ -2280,7 +2281,7 @@
 0008f4 bluetake technology co., ltd.
 0008f5 yestechnology co.,ltd.
 0008f6 sumitomo electric system solutions co.,ltd.
-0008f7 hitachi ltd, semiconductor & integrated circuits gr
+0008f7 hitachi ltd, semiconductor & integrated circuits gr
 0008f8 utc ccs
 0008f9 emerson network power
 0008fa karl e.brinkmann gmbh
@@ -2306,8 +2307,8 @@
 00090e helix technology inc.
 00090f fortinet inc.
 000910 simple access inc.
-000911 cisco systems
-000912 cisco systems
+000911 cisco systems, inc.
+000912 cisco systems, inc.
 000913 systemk corporation
 000914 computrols inc.
 000915 cas corp.
@@ -2320,7 +2321,7 @@
 00091c cachevision, inc
 00091d proteam computer corporation
 00091e firstech technology corp.
-00091f a&d co., ltd.
+00091f a&d co., ltd.
 000920 epox computer co.,ltd.
 000921 planmeca oy
 000922 tst biometrics gmbh
@@ -2356,8 +2357,8 @@
 000940 agfeo gmbh & co. kg
 000941 allied telesis k.k.
 000942 wireless technologies, inc
-000943 cisco systems
-000944 cisco systems
+000943 cisco systems, inc.
+000944 cisco systems, inc.
 000945 palmmicro communications inc
 000946 cluster labs gmbh
 000947 aztek, inc.
@@ -2412,8 +2413,8 @@
 000978 aiji system co., ltd.
 000979 advanced television systems committee, inc.
 00097a louis design labs.
-00097b cisco systems
-00097c cisco systems
+00097b cisco systems, inc.
+00097c cisco systems, inc.
 00097d secwell networks oy
 00097e imi technology co., ltd
 00097f vsecure 2000 ltd.
@@ -2471,8 +2472,8 @@
 0009b3 mcm systems ltd
 0009b4 kisan telecom co., ltd.
 0009b5 3j tech. co., ltd.
-0009b6 cisco systems
-0009b7 cisco systems
+0009b6 cisco systems, inc.
+0009b7 cisco systems, inc.
 0009b8 entise systems
 0009b9 action imaging solutions
 0009ba maku informationstechik gmbh
@@ -2505,7 +2506,7 @@
 0009d5 signal communication, inc.
 0009d6 knc one gmbh
 0009d7 dc security products
-0009d8 fält communications ab
+0009d8 fält communications ab
 0009d9 neoscale systems, inc
 0009da control module inc.
 0009db espace
@@ -2521,8 +2522,8 @@
 0009e5 hottinger baldwin messtechnik gmbh
 0009e6 cyber switching inc.
 0009e7 adc techonology
-0009e8 cisco systems
-0009e9 cisco systems
+0009e8 cisco systems, inc.
+0009e9 cisco systems, inc.
 0009ea yem inc.
 0009eb humandata ltd.
 0009ec daktronics, inc.
@@ -2609,8 +2610,8 @@
 000a3e eads telecom
 000a3f data east corporation
 000a40 crown audio -- harmanm international
-000a41 cisco systems
-000a42 cisco systems
+000a41 cisco systems, inc.
+000a42 cisco systems, inc.
 000a43 chunghwa telecom co., ltd.
 000a44 avery dennison deutschland gmbh
 000a45 audio-technica corp.
@@ -2632,7 +2633,7 @@
 000a55 markem corporation
 000a56 hitachi maxell ltd.
 000a57 hewlett-packard company - standards
-000a58 ingenieur-buero freyer & siegel
+000a58 ingenieur-büro freyer & siegel
 000a59 hw server
 000a5a greennet technologies co.,ltd.
 000a5b power-one as
@@ -2682,8 +2683,8 @@
 000a87 integrated micromachines inc.
 000a88 incypher s.a.
 000a89 creval systems, inc.
-000a8a cisco systems
-000a8b cisco systems
+000a8a cisco systems, inc.
+000a8b cisco systems, inc.
 000a8c guardware systems ltd.
 000a8d eurotherm limited
 000a8e invacom ltd
@@ -2727,8 +2728,8 @@
 000ab4 etic telecommunications
 000ab5 digital electronic network
 000ab6 compunetix, inc
-000ab7 cisco systems
-000ab8 cisco systems
+000ab7 cisco systems, inc.
+000ab8 cisco systems, inc.
 000ab9 astera technologies corp.
 000aba arcon technology limited
 000abb taiwan secom co,. ltd
@@ -2778,7 +2779,7 @@
 000ae7 eliop s.a.
 000ae8 cathay roxus information technology co. ltd
 000ae9 airvast technology inc.
-000aea adam elektronik ltd.sti.
+000aea adam elektronik ltd. Şti
 000aeb shenzhen tp-link technology co; ltd.
 000aec koatsu gas kogyo co., ltd.
 000aed harting systems gmbh & co kg
@@ -2787,8 +2788,8 @@
 000af0 shin-oh electronics co., ltd. r&d
 000af1 clarity design, inc.
 000af2 neoaxiom corp.
-000af3 cisco systems
-000af4 cisco systems
+000af3 cisco systems, inc.
+000af4 cisco systems, inc.
 000af5 airgo networks, inc.
 000af6 emerson climate technologies retail solutions, inc.
 000af7 broadcom corp.
@@ -2856,7 +2857,7 @@
 000b35 quad bit system co., ltd.
 000b36 productivity systems, inc.
 000b37 manufacture des montres rolex sa
-000b38 knuerr gmbh
+000b38 knürr gmbh
 000b39 keisoku giken co.,ltd.
 000b3a qustream corporation
 000b3b devolo ag
@@ -2864,13 +2865,13 @@
 000b3d contal ok ltd.
 000b3e bittware, inc
 000b3f anthology solutions inc.
-000b40 opnext inc.
-000b41 ing. buero dr. beutlhauser
+000b40 oclaro
+000b41 ing. büro dr. beutlhauser
 000b42 commax co., ltd.
 000b43 microscan systems, inc.
 000b44 concord idea corp.
-000b45 cisco
-000b46 cisco
+000b45 cisco systems, inc.
+000b46 cisco systems, inc.
 000b47 advanced energy
 000b48 sofrel
 000b49 rf-link system inc.
@@ -2895,10 +2896,10 @@
 000b5c newtech co.,ltd
 000b5d fujitsu limited
 000b5e audio engineering society inc.
-000b5f cisco systems
-000b60 cisco systems
-000b61 friedrich lütze gmbh &co.
-000b62 ingenieurbuero fuer elektronikdesign ingo mohnen
+000b5f cisco systems, inc.
+000b60 cisco systems, inc.
+000b61 friedrich lütze gmbh & co. kg
+000b62 ingenieurbüro für elektronikdesign ingo mohnen
 000b63 kaleidescape
 000b64 kieback & peter gmbh & co kg
 000b65 sy.a.c. srl
@@ -2933,7 +2934,7 @@
 000b82 grandstream networks, inc.
 000b83 datawatt b.v.
 000b84 bodet
-000b85 cisco systems
+000b85 cisco systems, inc.
 000b86 aruba networks
 000b87 american reliance inc.
 000b88 vidisco ltd.
@@ -2944,8 +2945,8 @@
 000b8d avvio networks
 000b8e ascent corporation
 000b8f akita electronics systems co.,ltd.
-000b90 adva optical networking inc.
-000b91 aglaia gesellschaft für bildverarbeitung und kommunikation m
+000b90 adva optical networking ltd.
+000b91 aglaia gesellschaft für bildverarbeitung und kommunikation mbh
 000b92 ascom danmark a/s
 000b93 ritter elektronik
 000b94 digital monitoring products, inc.
@@ -2990,8 +2991,8 @@
 000bbb etin systems co., ltd
 000bbc en garde systems, inc.
 000bbd connexionz limited
-000bbe cisco systems
-000bbf cisco systems
+000bbe cisco systems, inc.
+000bbf cisco systems, inc.
 000bc0 china iwncomm co., ltd.
 000bc1 bay microsystems, inc.
 000bc2 corinex communication corp.
@@ -3052,8 +3053,8 @@
 000bf9 gemstone communications, inc.
 000bfa exemys srl
 000bfb d-net international corporation
-000bfc cisco systems
-000bfd cisco systems
+000bfc cisco systems, inc.
+000bfd cisco systems, inc.
 000bfe castel broadband limited
 000bff berkeley camera engineering
 000c00 beb industrie-elektronik ag
@@ -3104,8 +3105,8 @@
 000c2d fullwave technology co., ltd.
 000c2e openet information technology(shenzhen) co., ltd.
 000c2f seorimtechnology co.,ltd.
-000c30 cisco
-000c31 cisco
+000c30 cisco systems, inc.
+000c31 cisco systems, inc.
 000c32 avionic design development gmbh
 000c33 compucase enterprise co. ltd.
 000c34 vixen co., ltd.
@@ -3133,7 +3134,7 @@
 000c4a cygnus microsystems (p) limited
 000c4b cheops elektronik
 000c4c arcor ag&co.
-000c4d acra control
+000c4d curtiss-wright controls avionics & electronics
 000c4e winbest technology co,lt
 000c4f udtech japan corporation
 000c50 seagate technology
@@ -3189,8 +3190,8 @@
 000c82 network technologies inc
 000c83 logical solutions
 000c84 eazix, inc.
-000c85 cisco systems
-000c86 cisco systems
+000c85 cisco systems, inc.
+000c86 cisco systems, inc.
 000c87 amd
 000c88 apache micro peripherals, inc.
 000c89 ac electric vehicles, ltd.
@@ -3262,8 +3263,8 @@
 000ccb design combus ltd
 000ccc aeroscout ltd.
 000ccd iec - tc57
-000cce cisco systems
-000ccf cisco systems
+000cce cisco systems, inc.
+000ccf cisco systems, inc.
 000cd0 symetrix
 000cd1 sfom technology corp.
 000cd2 schaffner emv ag
@@ -3298,7 +3299,7 @@
 000cef open networks engineering ltd
 000cf0 m & n gmbh
 000cf1 intel corporation
-000cf2 gamesa eÓlica
+000cf2 gamesa eólica
 000cf3 call image sa
 000cf4 akatsuki electric mfg.co.,ltd.
 000cf5 infoexpress
@@ -3352,8 +3353,8 @@
 000d25 sanden corporation
 000d26 primagraphics limited
 000d27 microplex printware ag
-000d28 cisco
-000d29 cisco
+000d28 cisco systems, inc.
+000d29 cisco systems, inc.
 000d2a scanmatic as
 000d2b racal instruments
 000d2c patapsco designs ltd
@@ -3398,7 +3399,7 @@
 000d53 beijing 5w communication corp.
 000d54 3com ltd
 000d55 sanycom technology co.,ltd
-000d56 dell pcba test
+000d56 dell esg pcba test
 000d57 fujitsu i-network systems limited.
 000d58 
 000d59 amity systems, inc.
@@ -3413,9 +3414,9 @@
 000d62 funkwerk dabendorf gmbh
 000d63 dent instruments, inc.
 000d64 comag handels ag
-000d65 cisco systems
-000d66 cisco systems
-000d67 belair networks inc.
+000d65 cisco systems, inc.
+000d66 cisco systems, inc.
+000d67 ericsson
 000d68 vinci systems, inc.
 000d69 tmt&d corporation
 000d6a redwood technologies ltd
@@ -3485,7 +3486,7 @@
 000daa s.a.tehnology co.,ltd.
 000dab parker hannifin gmbh electromechanical division europe
 000dac japan cbm corporation
-000dad dataprobe inc
+000dad dataprobe, inc.
 000dae samsung heavy industries co., ltd.
 000daf plexus corp (uk) ltd
 000db0 olym-tech co.,ltd.
@@ -3498,10 +3499,10 @@
 000db7 sanko electric co,.ltd
 000db8 schiller ag
 000db9 pc engines gmbh
-000dba océ document technologies gmbh
+000dba océ document technologies gmbh
 000dbb nippon dentsu co.,ltd.
-000dbc cisco systems
-000dbd cisco systems
+000dbc cisco systems, inc.
+000dbd cisco systems, inc.
 000dbe bel fuse europe ltd.,uk
 000dbf tektone sound & signal mfg., inc.
 000dc0 spagat as
@@ -3533,7 +3534,7 @@
 000dda allied telesis k.k.
 000ddb airwave technologies inc.
 000ddc vac
-000ddd profÝlo telra elektronÝk sanayÝ ve tÝcaret a.Þ.
+000ddd profilo telra elektronik sanayi ve ticaret. a.Ş
 000dde joyteck co., ltd.
 000ddf japan image & network inc.
 000de0 icpdas co.,ltd
@@ -3548,8 +3549,8 @@
 000de9 napatech aps
 000dea kingtel telecommunication corp.
 000deb compxs limited
-000dec cisco systems
-000ded cisco systems
+000dec cisco systems, inc.
+000ded cisco systems, inc.
 000dee andrew rf power amplifier group
 000def soc. coop. bilanciai
 000df0 qcom technology inc.
@@ -3581,11 +3582,11 @@
 000e0a sakuma design office
 000e0b netac technology co., ltd.
 000e0c intel corporation
-000e0d hesch schröder gmbh
+000e0d hesch schröder gmbh
 000e0e esa elettronica s.p.a.
 000e0f ermme
 000e10 c-guys, inc.
-000e11 bdt büro- und datentechnik gmbh & co. kg
+000e11 bdt büro und datentechnik gmbh & co.kg
 000e12 adaptive micro systems inc.
 000e13 accu-sort systems inc.
 000e14 visionary solutions, inc.
@@ -3624,8 +3625,8 @@
 000e35 intel corp
 000e36 heinesys, inc.
 000e37 harms & wende gmbh & co.kg
-000e38 cisco systems
-000e39 cisco systems
+000e38 cisco systems, inc.
+000e39 cisco systems, inc.
 000e3a cirrus logic
 000e3b hawking technologies, inc.
 000e3c transact technologies inc
@@ -3699,8 +3700,8 @@
 000e80 thomson technology inc
 000e81 devicescape software, inc.
 000e82 commtech wireless
-000e83 cisco systems
-000e84 cisco systems
+000e83 cisco systems, inc.
+000e84 cisco systems, inc.
 000e85 catalyst enterprises, inc.
 000e86 alcatel north america
 000e87 adp gauselmann gmbh
@@ -3715,7 +3716,7 @@
 000e90 ponico corp.
 000e91 navico auckland ltd
 000e92 millinet co., ltd.
-000e93 milénio 3 sistemas electrónicos, lda.
+000e93 milénio 3 sistemas electrónicos, lda.
 000e94 maas international bv
 000e95 fujiya denki seisakusho co.,ltd.
 000e96 cubic defense applications, inc.
@@ -3782,8 +3783,8 @@
 000ed3 epicenter, inc.
 000ed4 cresitt industrie
 000ed5 copan systems inc.
-000ed6 cisco systems
-000ed7 cisco systems
+000ed6 cisco systems, inc.
+000ed7 cisco systems, inc.
 000ed8 aktino, inc.
 000ed9 aksys, ltd.
 000eda c-tech united corp.
@@ -3855,12 +3856,12 @@
 000f1c digitall world co., ltd
 000f1d cosmo techs co., ltd.
 000f1e chengdu kt electric co.of high & new technology
-000f1f ww pcba test
+000f1f dell esg pcba test
 000f20 hewlett-packard company
 000f21 scientific atlanta, inc
 000f22 helius, inc.
-000f23 cisco systems
-000f24 cisco systems
+000f23 cisco systems, inc.
+000f24 cisco systems, inc.
 000f25 aimvalley b.v.
 000f26 worldaccxx  llc
 000f27 teal electronics, inc.
@@ -3876,8 +3877,8 @@
 000f31 allied vision technologies canada inc
 000f32 lootom optoelectronic technology (wuxi) co ltd
 000f33 duali inc.
-000f34 cisco systems
-000f35 cisco systems
+000f34 cisco systems, inc.
+000f35 cisco systems, inc.
 000f36 accurate techhnologies, inc.
 000f37 xambala incorporated
 000f38 netstar
@@ -3967,8 +3968,8 @@
 000f8c gigawavetech pte ltd
 000f8d fast tv-server ag
 000f8e dongyang telecom co.,ltd.
-000f8f cisco systems
-000f90 cisco systems
+000f8f cisco systems, inc.
+000f90 cisco systems, inc.
 000f91 aerotelecom co.,ltd.
 000f92 microhard systems inc.
 000f93 landis+gyr ltd.
@@ -4071,8 +4072,8 @@
 000ff4 guntermann & drunck gmbh
 000ff5 gn&s company
 000ff6 darfon electronics corp.
-000ff7 cisco systems
-000ff8 cisco  systems
+000ff7 cisco systems, inc.
+000ff8 cisco systems, inc.
 000ff9 valcretec, inc.
 000ffa optinel systems, inc.
 000ffb nippon denso industry co., ltd.
@@ -4367,8 +4368,8 @@
 00111d hectrix limited
 00111e epsg (ethernet powerlink standardization group)
 00111f doremi labs, inc.
-001120 cisco systems
-001121 cisco systems
+001120 cisco systems, inc.
+001121 cisco systems, inc.
 001122 cimsys inc
 001123 appointech, inc.
 001124 apple computer
@@ -4402,7 +4403,7 @@
 001140 nanometrics inc.
 001141 goodman corporation
 001142 e-smartcom  inc.
-001143 dell inc.
+001143 dell esg pcba test
 001144 assurance technology corp
 001145 valuepoint networks
 001146 telecard-pribor ltd
@@ -4427,8 +4428,8 @@
 001159 matisse networks inc
 00115a ivoclar vivadent ag
 00115b elitegroup computer system co. (ecs)
-00115c cisco
-00115d cisco
+00115c cisco systems, inc.
+00115d cisco systems, inc.
 00115e prominent dosiertechnik gmbh
 00115f itx security co., ltd.
 001160 artdio company co., ltd
@@ -4458,7 +4459,7 @@
 001178 chiron technology ltd
 001179 singular technology co. ltd.
 00117a singim international corp.
-00117b büchi labortechnik ag
+00117b büchi  labortechnik ag
 00117c e-zy.net
 00117d zmd america, inc.
 00117e progeny, a division of midmark corp
@@ -4466,7 +4467,7 @@
 001180 motorola mobility, inc.
 001181 interenergy co.ltd,
 001182 imi norgren ltd
-001183 datalogic mobile, inc.
+001183 datalogic adc, inc.
 001184 humo laboratory,ltd.
 001185 hewlett-packard company
 001186 prime systems, inc.
@@ -4481,14 +4482,14 @@
 00118f eutech instruments pte. ltd.
 001190 digital design corporation
 001191 cts-clima temperatur systeme gmbh
-001192 cisco systems
-001193 cisco systems
+001192 cisco systems, inc.
+001193 cisco systems, inc.
 001194 chi mei communication systems, inc.
 001195 d-link corporation
 001196 actuality systems, inc.
 001197 monitoring technologies limited
 001198 prism media products limited
-001199 2wcom gmbh
+001199 2wcom systems gmbh
 00119a alkeria srl
 00119b telesynergy research inc.
 00119c ep&t energy
@@ -4522,8 +4523,8 @@
 0011b8 liebherr - elektronik gmbh
 0011b9 inner range pty. ltd.
 0011ba elexol pty ltd
-0011bb cisco systems
-0011bc cisco systems
+0011bb cisco systems, inc.
+0011bc cisco systems, inc.
 0011bd bombardier transportation
 0011be agp telecom co. ltd
 0011bf aesys s.p.a.
@@ -4591,10 +4592,10 @@
 0011fd korg inc.
 0011fe keiyo system research, inc.
 0011ff digitro tecnologia ltda
-001200 cisco
-001201 cisco
+001200 cisco systems, inc.
+001201 cisco systems, inc.
 001202 decrane aerospace - audio international inc.
-001203 activ networks
+001203 activnetworks
 001204 u10 networks, inc.
 001205 terrasat communications, inc.
 001206 iquest (nz) ltd
@@ -4654,12 +4655,12 @@
 00123c second rule llc
 00123d ges
 00123e erune technology co., ltd.
-00123f dell inc
+00123f dell esg pcba test
 001240 amoi electronics co.,ltd
 001241 a2i marketing center
 001242 millennial net
-001243 cisco
-001244 cisco
+001243 cisco systems, inc.
+001244 cisco systems, inc.
 001245 zellweger analytics, inc.
 001246 t.o.m technology inc..
 001247 samsung electronics co., ltd.
@@ -4718,8 +4719,8 @@
 00127c swegon ab
 00127d mobilearia
 00127e digital lifestyles group, inc.
-00127f cisco
-001280 cisco
+00127f cisco systems, inc.
+001280 cisco systems, inc.
 001281 march networks s.p.a.
 001282 qovia
 001283 nortel networks
@@ -4808,8 +4809,8 @@
 0012d6 jiangsu yitong high-tech co.,ltd
 0012d7 invento networks, inc.
 0012d8 international games system co., ltd.
-0012d9 cisco systems
-0012da cisco systems
+0012d9 cisco systems, inc.
+0012da cisco systems, inc.
 0012db ziehl industrie-elektronik gmbh + co kg
 0012dc suncorp industrial limited
 0012dd shengqu information technology (shanghai) co., ltd.
@@ -4872,8 +4873,8 @@
 001316 l-s-b broadcast technologies gmbh
 001317 gn netcom as
 001318 dgstation co., ltd.
-001319 cisco systems
-00131a cisco systems
+001319 cisco systems, inc.
+00131a cisco systems, inc.
 00131b becell innovations corp.
 00131c litetouch, inc.
 00131d scanvaegt international a/s
@@ -4942,8 +4943,8 @@
 00135c onsite systems, inc.
 00135d nttpc communications, inc.
 00135e eab/rwi/k
-00135f cisco systems
-001360 cisco systems
+00135f cisco systems, inc.
+001360 cisco systems, inc.
 001361 biospace co., ltd.
 001362 shinheung precision co., ltd.
 001363 verascape, inc.
@@ -4961,7 +4962,7 @@
 00136f packetmotion, inc.
 001370 nokia danmark a/s
 001371 motorola mobility, inc.
-001372 dell inc.
+001372 dell esg pcba test
 001373 blwave electronics co., ltd
 001374 atheros communications, inc.
 001375 american security products co.
@@ -4974,8 +4975,8 @@
 00137c kaicom co., ltd.
 00137d dynalab, inc.
 00137e coredge networks, inc.
-00137f cisco systems
-001380 cisco systems
+00137f cisco systems, inc.
+001380 cisco systems, inc.
 001381 chips & systems, inc.
 001382 cetacea networks corporation
 001383 application technologies and engineering research laboratory
@@ -4984,7 +4985,7 @@
 001386 abb inc./totalflow
 001387 27m technologies ab
 001388 wimedia alliance
-001389 redes de telefonía móvil s.a.
+001389 redes de telefonía móvil s.a.
 00138a qingdao goertek electronics co.,ltd.
 00138b phantom technologies llc
 00138c kumyoung.co.ltd
@@ -4998,7 +4999,7 @@
 001394 infohand co.,ltd
 001395 congatec ag
 001396 acbel polytech inc.
-001397 xsigo systems, inc.
+001397 oracle corporation
 001398 trafficsim co.,ltd
 001399 stac corporation.
 00139a k-ubique id corp.
@@ -5042,8 +5043,8 @@
 0013c0 trix tecnologia ltda.
 0013c1 asoka usa corporation
 0013c2 wacom co.,ltd
-0013c3 cisco systems
-0013c4 cisco systems
+0013c3 cisco systems, inc.
+0013c4 cisco systems, inc.
 0013c5 lightron fiber-optic devices inc.
 0013c6 opengear, inc
 0013c7 ionos co.,ltd.
@@ -5122,7 +5123,7 @@
 001410 suzhou keda technology co.,ltd
 001411 deutschmann automation gmbh & co. kg
 001412 s-tec electronics ag
-001413 trebing & himstedt prozessautomation gmbh & co. kg
+001413 trebing & himstedt prozeßautomation gmbh & co. kg
 001414 jumpnode systems llc.
 001415 intec automation inc.
 001416 scosche industries, inc.
@@ -5130,14 +5131,14 @@
 001418 c4line
 001419 sidsa
 00141a deicy corporation
-00141b cisco systems
-00141c cisco systems
+00141b cisco systems, inc.
+00141c cisco systems, inc.
 00141d lust antriebstechnik gmbh
 00141e p.a. semi, inc.
 00141f sunkwang electronics co., ltd
 001420 g-links networking company
 001421 total wireless technologies pte. ltd.
-001422 dell inc.
+001422 dell esg pcba test
 001423 j-s co. neurocom
 001424 merry electrics co., ltd.
 001425 galactic computing corp.
@@ -5208,8 +5209,8 @@
 001466 kleinhenz elektronik gmbh
 001467 arrowspan inc.
 001468 celplan international, inc.
-001469 cisco systems
-00146a cisco systems
+001469 cisco systems, inc.
+00146a cisco systems, inc.
 00146b anagran, inc.
 00146c netgear inc.
 00146d rf technologies
@@ -5271,14 +5272,14 @@
 0014a5 gemtek technology co., ltd.
 0014a6 teranetics, inc.
 0014a7 nokia danmark a/s
-0014a8 cisco systems
-0014a9 cisco systems
+0014a8 cisco systems, inc.
+0014a9 cisco systems, inc.
 0014aa ashly audio, inc.
 0014ab senhai electronic technology co., ltd.
 0014ac bountiful wifi
-0014ad gassner wiege- u. meßtechnik gmbh
+0014ad gassner wiege- und meßtechnik gmbh
 0014ae wizlogics co., ltd.
-0014af datasym inc.
+0014af datasym pos inc.
 0014b0 naeil community
 0014b1 avitec ab
 0014b2 mcubelogics corporation
@@ -5344,13 +5345,13 @@
 0014ee western digital technologies, inc.
 0014ef tzero technologies, inc.
 0014f0 business security ol ab
-0014f1 cisco systems
-0014f2 cisco systems
+0014f1 cisco systems, inc.
+0014f2 cisco systems, inc.
 0014f3 vixs systems inc
 0014f4 dektec digital video b.v.
 0014f5 osi security devices
 0014f6 juniper networks, inc.
-0014f7 crevis
+0014f7 crevis co., ltd
 0014f8 scientific atlanta
 0014f9 vantage controls
 0014fa asga s.a.
@@ -5402,16 +5403,16 @@
 001528 beacon medical products llc d.b.a. beaconmedaes
 001529 n3 corporation
 00152a nokia gmbh
-00152b cisco systems
-00152c cisco systems
+00152b cisco systems, inc.
+00152c cisco systems, inc.
 00152d tenx networks, llc
 00152e packethop, inc.
 00152f motorola mobility, inc.
-001530 bus-tech, inc.
+001530 emc corporation
 001531 kocom
 001532 consumer technologies group, llc
 001533 nadam.co.,ltd
-001534 a beltrÓnica, companhia de comunicações, lda
+001534 a beltrónica-companhia de comunicações, lda
 001535 ote spa
 001536 powertech co.,ltd
 001537 ventus networks
@@ -5457,8 +5458,8 @@
 00155f greenpeak technologies
 001560 hewlett-packard company
 001561 jjplus corporation
-001562 cisco systems
-001563 cisco systems
+001562 cisco systems, inc.
+001563 cisco systems, inc.
 001564 behringer spezielle studiotechnik gmbh
 001565 xiamen yealink network technology co.,ltd
 001566 a-first technology co., ltd.
@@ -5477,7 +5478,7 @@
 001573 newsoft  technology corporation
 001574 horizon semiconductors ltd.
 001575 nevis networks inc.
-001576 scil animal care company gmbh
+001576 labitec - labor biomedical technologies gmbh
 001577 allied telesis
 001578 audio / video innovations
 001579 lunatone industrielle elektronik gmbh
@@ -5485,7 +5486,7 @@
 00157b leuze electronic gmbh + co. kg
 00157c dave networks, inc.
 00157d posdata co., ltd.
-00157e weidmüller interface gmbh & co. kg
+00157e weidmüller interface gmbh & co. kg
 00157f chuang international holding co.,ltd.
 001580 u-way corporation
 001581 makus inc.
@@ -5556,9 +5557,9 @@
 0015c2 3m germany
 0015c3 ruf telematik ag
 0015c4 flovel co., ltd.
-0015c5 dell inc
-0015c6 cisco systems
-0015c7 cisco systems
+0015c5 dell esg pcba test
+0015c6 cisco systems, inc.
+0015c7 cisco systems, inc.
 0015c8 flexipanel ltd
 0015c9 gumstix, inc
 0015ca terarecon, inc.
@@ -5608,8 +5609,8 @@
 0015f6 science and engineering services, inc.
 0015f7 wintecronics ltd.
 0015f8 kingtronics industrial co. ltd.
-0015f9 cisco systems
-0015fa cisco systems
+0015f9 cisco systems, inc.
+0015fa cisco systems, inc.
 0015fb setex schermuly textile computer gmbh
 0015fc littelfuse startco
 0015fd complete media systems
@@ -5640,7 +5641,7 @@
 001616 browan communication inc.
 001617 msi
 001618 hivion co., ltd.
-001619 la factoría de comunicaciones aplicadas,s.l.
+001619 la factoría de comunicaciones aplicadas,s.l.
 00161a dametric ab
 00161b micronet corporation
 00161c e:cue
@@ -5662,7 +5663,7 @@
 00162c xanboo
 00162d stnet co., ltd.
 00162e space shuttle hi-tech co., ltd.
-00162f geutebrück gmbh
+00162f geutebrück gmbh
 001630 vativ technologies
 001631 xteam
 001632 samsung electronics co., ltd.
@@ -5670,7 +5671,7 @@
 001634 mathtech, inc.
 001635 hewlett-packard company
 001636 quanta computer inc.
-001637 citel srl
+001637 citel spa
 001638 tecom co., ltd.
 001639 ubiquam co.,ltd
 00163a yves technology co., ltd.
@@ -5685,8 +5686,8 @@
 001643 sunhillo corporation
 001644 lite-on technology corp.
 001645 power distribution, inc.
-001646 cisco systems
-001647 cisco systems
+001646 cisco systems, inc.
+001647 cisco systems, inc.
 001648 ssd company limited
 001649 setone gmbh
 00164a vibration technology limited
@@ -5734,7 +5735,7 @@
 001674 eurocb (phils.), inc.
 001675 motorola mobility, inc.
 001676 intel corporation
-001677 bihl+wiedemann gmbh
+001677 bihl + wiedemann gmbh
 001678 shenzhen baoan gaoke electronics co., ltd
 001679 eon communications
 00167a skyworth overseas dvelopment ltd.
@@ -5771,8 +5772,8 @@
 001699 tonic dvb marketing ltd
 00169a quadrics ltd
 00169b alstom transport
-00169c cisco systems
-00169d cisco systems
+00169c cisco systems, inc.
+00169d cisco systems, inc.
 00169e tv one ltd
 00169f vimtron electronics co., ltd.
 0016a0 auto-maskin
@@ -5814,8 +5815,8 @@
 0016c4 sirf technology, inc.
 0016c5 shenzhen xing feng industry co.,ltd
 0016c6 north atlantic industries
-0016c7 cisco systems
-0016c8 cisco systems
+0016c7 cisco systems, inc.
+0016c8 cisco systems, inc.
 0016c9 nat seattle, inc.
 0016ca nortel
 0016cb apple computer
@@ -5862,7 +5863,7 @@
 0016f4 eidicom co., ltd.
 0016f5 dalian golden hualu digital technology co.,ltd
 0016f6 video products group
-0016f7 l-3 communications, electrodynamics, inc.
+0016f7 l-3 communications, aviation recorders
 0016f8 aviqtech technology co., ltd.
 0016f9 cetrta pot, d.o.o., kranj
 0016fa eci telecom ltd.
@@ -5885,8 +5886,8 @@
 00170b contela, inc.
 00170c twig com ltd.
 00170d dust networks inc.
-00170e cisco systems
-00170f cisco systems
+00170e cisco systems, inc.
+00170f cisco systems, inc.
 001710 casa systems inc.
 001711 ge healthcare bio-sciences ab
 001712 isco international
@@ -5960,8 +5961,8 @@
 001756 vinci labs oy
 001757 rix technology limited
 001758 thruvision ltd
-001759 cisco systems
-00175a cisco systems
+001759 cisco systems, inc.
+00175a cisco systems, inc.
 00175b acs solutions switzerland ltd.
 00175c sharp corporation
 00175d dongseo system.
@@ -6019,8 +6020,8 @@
 001791 lintech gmbh
 001792 falcom wireless comunications gmbh
 001793 tigi corporation
-001794 cisco systems
-001795 cisco systems
+001794 cisco systems, inc.
+001795 cisco systems, inc.
 001796 rittmeyer ag
 001797 telsy elettronica s.p.a.
 001798 azonic technology co., ltd
@@ -6094,8 +6095,8 @@
 0017dc daemyung zero1
 0017dd clipsal australia
 0017de advantage six ltd
-0017df cisco systems
-0017e0 cisco systems
+0017df cisco systems, inc.
+0017e0 cisco systems, inc.
 0017e1 dacos technologies co., ltd.
 0017e2 motorola mobility, inc.
 0017e3 texas instruments
@@ -6151,8 +6152,8 @@
 001815 gz technologies, inc.
 001816 ubixon co., ltd.
 001817 d. e. shaw research, llc
-001818 cisco systems
-001819 cisco systems
+001818 cisco systems, inc.
+001819 cisco systems, inc.
 00181a avermedia information inc.
 00181b taijin metal co., ltd.
 00181c exterity limited
@@ -6172,7 +6173,7 @@
 00182a taiwan video & monitor
 00182b softier
 00182c ascend networks, inc.
-00182d artec group oÜ
+00182d artec design
 00182e xstreamhd, llc
 00182f texas instruments
 001830 texas instruments
@@ -6227,7 +6228,7 @@
 001861 ooma, inc.
 001862 seagate technology
 001863 veritech electronics limited
-001864 cybectec inc.
+001864 eaton corporation
 001865 siemens healthcare diagnostics manufacturing ltd
 001866 leutron vision
 001867 evolution robotics retail
@@ -6242,8 +6243,8 @@
 001870 e28 shanghai limited
 001871 hewlett-packard company
 001872 expertise engineering
-001873 cisco systems
-001874 cisco systems
+001873 cisco systems, inc.
+001874 cisco systems, inc.
 001875 anacise testnology pte ltd
 001876 wowwee ltd.
 001877 amplex a/s
@@ -6266,7 +6267,7 @@
 001888 gotive a.s.
 001889 winnet solutions limited
 00188a infinova llc
-00188b dell
+00188b dell esg pcba test
 00188c mobile action technology inc.
 00188d nokia danmark a/s
 00188e ekahau, inc.
@@ -6312,15 +6313,15 @@
 0018b6 s3c, inc.
 0018b7 d3 led, llc
 0018b8 new voice international ag
-0018b9 cisco systems
-0018ba cisco systems
+0018b9 cisco systems, inc.
+0018ba cisco systems, inc.
 0018bb eliwell controls srl
 0018bc zao nvp bolid
 0018bd shenzhen dvbworld technology co., ltd.
 0018be ansa corporation
 0018bf essence technology solution, inc.
 0018c0 motorola mobility, inc.
-0018c1 almitec informática e comércio ltda.
+0018c1 almitec informática e comércio
 0018c2 firetide, inc
 0018c3 cs corporation
 0018c4 raba technologies llc
@@ -6389,10 +6390,10 @@
 001903 bigfoot networks inc
 001904 wb electronics sp. z o.o.
 001905 schrack seconet ag
-001906 cisco systems
-001907 cisco systems
+001906 cisco systems, inc.
+001907 cisco systems, inc.
 001908 duaxes corporation
-001909 devi a/s
+001909 devi - danfoss a/s
 00190a hasware inc.
 00190b southern vision systems, inc.
 00190c encore electronics, inc.
@@ -6430,13 +6431,13 @@
 00192c motorola mobility, inc.
 00192d nokia corporation
 00192e spectral instruments, inc.
-00192f cisco systems
-001930 cisco systems
+00192f cisco systems, inc.
+001930 cisco systems, inc.
 001931 balluff gmbh
 001932 gude analog- und digialsysteme gmbh
 001933 strix systems, inc.
 001934 trendon touch technology corp.
-001935 duerr dental gmbh & co. kg
+001935 dÜrr dental ag
 001936 sterlite optical technologies limited
 001937 commerceguard ab
 001938 umb communications co., ltd.
@@ -6468,8 +6469,8 @@
 001952 acogito co., ltd
 001953 chainleader communications corp.
 001954 leaf corporation.
-001955 cisco systems
-001956 cisco systems
+001955 cisco systems, inc.
+001956 cisco systems, inc.
 001957 saafnet canada inc.
 001958 bluetooth sig, inc.
 001959 staccato communications inc.
@@ -6552,8 +6553,8 @@
 0019a6 motorola mobility, inc.
 0019a7 itu-t
 0019a8 wiquest communications
-0019a9 cisco systems
-0019aa cisco systems
+0019a9 cisco systems, inc.
+0019aa cisco systems, inc.
 0019ab raycom co ., ltd
 0019ac gsp systems inc.
 0019ad bobst sa
@@ -6614,8 +6615,8 @@
 0019e4 2wire, inc
 0019e5 lynx studio technology, inc.
 0019e6 toyo medic co.,ltd.
-0019e7 cisco systems
-0019e8 cisco systems
+0019e7 cisco systems, inc.
+0019e8 cisco systems, inc.
 0019e9 s-information technolgy, co., ltd.
 0019ea teramage technologies co., ltd.
 0019eb pyronix ltd
@@ -6686,8 +6687,8 @@
 001a2c satec co.,ltd
 001a2d the navvo group
 001a2e ziova coporation
-001a2f cisco systems
-001a30 cisco systems
+001a2f cisco systems, inc.
+001a30 cisco systems, inc.
 001a31 scan coin industries ab
 001a32 activa multimedia
 001a33 asi communications, inc.
@@ -6747,8 +6748,8 @@
 001a69 wuhan yangtze optical technology co.,ltd.
 001a6a tranzas, inc.
 001a6b universal global scientific industrial co., ltd.
-001a6c cisco systems
-001a6d cisco systems
+001a6c cisco systems, inc.
+001a6d cisco systems, inc.
 001a6e impro technologies
 001a6f mi.tel s.r.l.
 001a70 cisco-linksys, llc
@@ -6783,7 +6784,7 @@
 001a8d avecs bergen gmbh
 001a8e 3way networks ltd
 001a8f nortel
-001a90 trópico sistemas e telecomunicações da amazônia ltda.
+001a90 trópico sistemas e telecomunicações da amazônia ltda.
 001a91 fusiondynamic ltd.
 001a92 asustek computer inc.
 001a93 erco leuchten gmbh
@@ -6798,10 +6799,10 @@
 001a9c righthand technologies, inc.
 001a9d skipper wireless, inc.
 001a9e icon digital international limited
-001a9f a-link europe ltd
+001a9f a-link ltd
 001aa0 dell inc
-001aa1 cisco systems
-001aa2 cisco systems
+001aa1 cisco systems, inc.
+001aa2 cisco systems, inc.
 001aa3 delorme
 001aa4 future university-hakodate
 001aa5 brn phoenix
@@ -6865,8 +6866,8 @@
 001adf interactivetv pty limited
 001ae0 mythology tech express inc.
 001ae1 edge access inc
-001ae2 cisco systems
-001ae3 cisco systems
+001ae2 cisco systems, inc.
+001ae3 cisco systems, inc.
 001ae4 medicis technologies corporation
 001ae5 mvox technologies inc.
 001ae6 atlanta advanced communications holdings limited
@@ -6907,8 +6908,8 @@
 001b09 matrix telecom pvt. ltd.
 001b0a intelligent distributed controls ltd
 001b0b phidgets inc.
-001b0c cisco systems
-001b0d cisco systems
+001b0c cisco systems, inc.
+001b0d cisco systems, inc.
 001b0e inotec gmbh organisationssysteme
 001b0f petratec
 001b10 shenzhen kang hui technology co.,ltd
@@ -6937,8 +6938,8 @@
 001b27 merlin csi
 001b28 polygon, jsc
 001b29 avantis.co.,ltd
-001b2a cisco systems
-001b2b cisco systems
+001b2a cisco systems, inc.
+001b2b cisco systems, inc.
 001b2c atron electronic gmbh
 001b2d med-eng systems inc.
 001b2e sinkyo electron inc
@@ -6978,8 +6979,8 @@
 001b50 nizhny novgorod factory named after m.frunze, fsue (nzif)
 001b51 vector technology corp.
 001b52 motorola mobility, inc.
-001b53 cisco systems
-001b54 cisco systems
+001b53 cisco systems, inc.
+001b54 cisco systems, inc.
 001b55 hurco automation ltd.
 001b56 tehuti networks ltd.
 001b57 semindia systems private limited
@@ -7038,8 +7039,8 @@
 001b8c jmicron technology corp.
 001b8d electronic computer systems, inc.
 001b8e hulu sweden ab
-001b8f cisco systems
-001b90 cisco systems
+001b8f cisco systems, inc.
+001b90 cisco systems, inc.
 001b91 efkon ag
 001b92 l-acoustics
 001b93 jc decaux sa dnt
@@ -7056,7 +7057,7 @@
 001b9e askey  computer  corp
 001b9f calyptech pty ltd
 001ba0 awox
-001ba1 Ã…mic ab
+001ba1 Åmic ab
 001ba2 ids imaging development systems gmbh
 001ba3 flexit group gmbh
 001ba4 s.a.e afikim
@@ -7107,8 +7108,8 @@
 001bd1 sogestmatic
 001bd2 ultra-x asia pacific inc.
 001bd3 matsushita electric panasonic avc
-001bd4 cisco systems
-001bd5 cisco systems
+001bd4 cisco systems, inc.
+001bd5 cisco systems, inc.
 001bd6 kelvin hughes ltd
 001bd7 scientific atlanta, a cisco company
 001bd8 dvtel ltd
@@ -7140,7 +7141,7 @@
 001bf2 kworld computer co., ltd
 001bf3 transradio sendersysteme berlin ag
 001bf4 kenwin industrial(hk) ltd.
-001bf5 tellink sistemas de telecomunicación s.l.
+001bf5 tellink sistemas de telecomunicación s.l.
 001bf6 conwise technology corporation ltd.
 001bf7 lund ip products ab
 001bf8 digitrax inc.
@@ -7165,8 +7166,8 @@
 001c0b smartant telecom
 001c0c tanita corporation
 001c0d g-technology, inc.
-001c0e cisco systems
-001c0f cisco systems
+001c0e cisco systems, inc.
+001c0f cisco systems, inc.
 001c10 cisco-linksys, llc
 001c11 motorola mobility, inc.
 001c12 motorola mobility, inc.
@@ -7238,8 +7239,8 @@
 001c54 hillstone networks inc
 001c55 shenzhen kaifa technology co.
 001c56 pado systems, inc.
-001c57 cisco systems
-001c58 cisco systems
+001c57 cisco systems, inc.
+001c58 cisco systems, inc.
 001c59 devon it
 001c5a advanced relay corporation
 001c5b chubb electronic security systems ltd
@@ -7248,10 +7249,10 @@
 001c5e aston france
 001c5f winland electronics, inc.
 001c60 csp frontier technologies,inc.
-001c61 galaxy technology (hk) ltd.
+001c61 galaxy  microsystems limited
 001c62 lg electronics inc
 001c63 truen
-001c64 cellnet+hunt
+001c64 landis+gyr
 001c65 joescan, inc.
 001c66 ucamp co.,ltd
 001c67 pumpkin networks, inc.
@@ -7327,8 +7328,8 @@
 001cad wuhan telecommunication devices co.,ltd
 001cae wichorus, inc.
 001caf plato networks inc.
-001cb0 cisco systems
-001cb1 cisco systems
+001cb0 cisco systems, inc.
+001cb1 cisco systems, inc.
 001cb2 bpt spa
 001cb3 apple, inc
 001cb4 iridium satellite llc
@@ -7397,10 +7398,10 @@
 001cf3 evs broadcast equipment
 001cf4 media technology systems inc
 001cf5 wiseblue technology limited
-001cf6 cisco systems
+001cf6 cisco systems, inc.
 001cf7 audioscience
 001cf8 parade technologies, ltd.
-001cf9 cisco systems
+001cf9 cisco systems, inc.
 001cfa alarm.com
 001cfb motorola mobility, inc.
 001cfc suminet communication technologies (shanghai) co., ltd.
@@ -7449,7 +7450,7 @@
 001d27 nac-intercom
 001d28 sony ericsson mobile communications ab
 001d29 doro ab
-001d2a tideway electronic ltd
+001d2a shenzhen bul-tech co.,ltd.
 001d2b wuhan pont technology co. , ltd
 001d2c wavetrend technologies (pty) limited
 001d2d pylone, inc.
@@ -7476,8 +7477,8 @@
 001d42 nortel
 001d43 shenzhen g-link digital technology co., ltd.
 001d44 krohne
-001d45 cisco systems
-001d46 cisco systems
+001d45 cisco systems, inc.
+001d46 cisco systems, inc.
 001d47 covote gmbh & co kg
 001d48 sensor-technik wiedemann gmbh
 001d49 innovation wireless inc.
@@ -7498,7 +7499,7 @@
 001d58 cq inc
 001d59 mitra energy & infrastructure
 001d5a 2wire inc.
-001d5b tecvan informatica ltda
+001d5b tecvan informática ltda
 001d5c tom communication industrial co.,ltd.
 001d5d control dynamics pty. ltd.
 001d5e coming media corp.
@@ -7519,8 +7520,8 @@
 001d6d confidant international llc
 001d6e nokia danmark a/s
 001d6f chainzone technology co., ltd
-001d70 cisco systems
-001d71 cisco systems
+001d70 cisco systems, inc.
+001d71 cisco systems, inc.
 001d72 wistron corporation
 001d73 buffalo inc.
 001d74 tianjin china-silicon microelectronics co., ltd.
@@ -7568,8 +7569,8 @@
 001d9e axion technologies
 001d9f matt   r.p.traczynscy sp.j.
 001da0 heng yu electronic manufacturing company limited
-001da1 cisco systems
-001da2 cisco systems
+001da1 cisco systems, inc.
+001da2 cisco systems, inc.
 001da3 sabioso
 001da4 hangzhou system technology co., ltd
 001da5 wb electronics
@@ -7610,7 +7611,7 @@
 001dc8 scadametrcs, llc.
 001dc9 gainspan corp.
 001dca pav electronics limited
-001dcb exéns development oy
+001dcb exéns development oy
 001dcc hetra secure solutions
 001dcd arris group, inc.
 001dce arris group, inc.
@@ -7636,8 +7637,8 @@
 001de2 radionor communications
 001de3 intuicom
 001de4 visioneered image systems
-001de5 cisco systems
-001de6 cisco systems
+001de5 cisco systems, inc.
+001de6 cisco systems, inc.
 001de7 marine sonic technology, ltd.
 001de8 nikko denki tsushin company(ndtc)
 001de9 nokia danmark a/s
@@ -7645,7 +7646,7 @@
 001deb dinec international
 001dec marusys
 001ded grid net, inc.
-001dee nextvision sistemas digitais de televisÃo ltda.
+001dee nextvision sistemas digitais de televisÃo ltda.
 001def trimm, inc.
 001df0 vidient systems, inc.
 001df1 intego systems, inc.
@@ -7654,7 +7655,7 @@
 001df4 magellan technology pty limited
 001df5 sunshine co,ltd
 001df6 samsung electronics co.,ltd
-001df7 r. stahl schaltgeräte gmbh
+001df7 r. stahl schaltgeräte gmbh
 001df8 webpro vision technology corporation
 001df9 cybiotronics (far east) limited
 001dfa fujian landi commercial equipment co.,ltd
@@ -7682,8 +7683,8 @@
 001e10 shenzhen huawei communication technologies co.,ltd.
 001e11 elelux international ltd
 001e12 ecolab
-001e13 cisco systems
-001e14 cisco systems
+001e13 cisco systems, inc.
+001e14 cisco systems, inc.
 001e15 beech hill electronics
 001e16 keytronix
 001e17 stn bv
@@ -7736,8 +7737,8 @@
 001e46 motorola mobility, inc.
 001e47 pt. hariff daya tunggal engineering
 001e48 wi-links
-001e49 cisco systems
-001e4a cisco systems
+001e49 cisco systems, inc.
+001e4a cisco systems, inc.
 001e4b city theatrical
 001e4c hon hai precision ind.co., ltd.
 001e4d welkin sciences, llc
@@ -7784,8 +7785,8 @@
 001e76 thermo fisher scientific
 001e77 air2app
 001e78 owitek technology ltd.,
-001e79 cisco systems
-001e7a cisco systems
+001e79 cisco systems, inc.
+001e7a cisco systems, inc.
 001e7b r.i.co. s.r.l.
 001e7c taiwick limited
 001e7d samsung electronics co.,ltd
@@ -7852,8 +7853,8 @@
 001eba high density devices as
 001ebb bluelight technology inc.
 001ebc wintech automation co.,ltd.
-001ebd cisco systems
-001ebe cisco systems
+001ebd cisco systems, inc.
+001ebe cisco systems, inc.
 001ebf haas automation inc.
 001ec0 microchip technology inc.
 001ec1 3com europe ltd
@@ -7909,8 +7910,8 @@
 001ef3 from2
 001ef4 l-3 communications display systems
 001ef5 hitek automated inc.
-001ef6 cisco systems
-001ef7 cisco systems
+001ef6 cisco systems, inc.
+001ef7 cisco systems, inc.
 001ef8 emfinity inc.
 001ef9 pascom kommunikations systeme gmbh.
 001efa protei ltd.
@@ -7957,8 +7958,8 @@
 001f23 interacoustics
 001f24 digitview technology co., ltd.
 001f25 mbs gmbh
-001f26 cisco systems
-001f27 cisco systems
+001f26 cisco systems, inc.
+001f27 cisco systems, inc.
 001f28 procurve networking by hp
 001f29 hewlett-packard company
 001f2a accm
@@ -8002,7 +8003,7 @@
 001f50 swissdis ag
 001f51 hd communications corp
 001f52 uvt unternehmensberatung fur verkehr und technik gmbh
-001f53 gemac gesellschaft für mikroelektronikanwendung chemnitz mbh
+001f53 gemac gesellschaft für mikroelektronikanwendung chemnitz mbh
 001f54 lorex technology inc.
 001f55 honeywell security (china) co., ltd.
 001f56 digital forecast
@@ -8027,8 +8028,8 @@
 001f69 pingood technology co., ltd.
 001f6a packetflux technologies, inc.
 001f6b lg electronics
-001f6c cisco systems
-001f6d cisco systems
+001f6c cisco systems, inc.
+001f6d cisco systems, inc.
 001f6e vtech engineering corporation
 001f6f fujian sunnada communication co.,ltd.
 001f70 botik technologies ltd
@@ -8076,8 +8077,8 @@
 001f9a nortel networks
 001f9b posbro
 001f9c ledco
-001f9d cisco systems
-001f9e cisco systems
+001f9d cisco systems, inc.
+001f9e cisco systems, inc.
 001f9f thomson telecom belgium
 001fa0 a10 networks
 001fa1 gtran inc
@@ -8120,8 +8121,8 @@
 001fc6 asustek computer inc.
 001fc7 casio hitachi mobile comunications co., ltd.
 001fc8 up-today industrial co., ltd.
-001fc9 cisco systems
-001fca cisco systems
+001fc9 cisco systems, inc.
+001fca cisco systems, inc.
 001fcb niw solutions
 001fcc samsung electronics co.,ltd
 001fcd samsung electronics
@@ -8155,7 +8156,7 @@
 001fe9 printrex, inc.
 001fea applied media technologies corporation
 001feb trio datacom pty ltd
-001fec synapse électronique
+001fec synapse Électronique
 001fed tecan systems inc.
 001fee ubisys technologies gmbh
 001fef shinsei industries co.,ltd
@@ -8345,7 +8346,7 @@
 0020a7 pairgain technologies, inc.
 0020a8 sast technology corp.
 0020a9 white horse industrial
-0020aa digimedia vision ltd.
+0020aa ericsson television limited
 0020ab micro industries corp.
 0020ac interflex datensysteme gmbh
 0020ad linq systems
@@ -8458,8 +8459,8 @@
 002118 athena tech, inc.
 002119 samsung electro-mechanics
 00211a lintech corporation
-00211b cisco systems
-00211c cisco systems
+00211b cisco systems, inc.
+00211c cisco systems, inc.
 00211d dataline ab
 00211e motorola mobility, inc.
 00211f shinsung deltatech co.,ltd.
@@ -8516,8 +8517,8 @@
 002152 general satellite research & development limited
 002153 seamicro inc.
 002154 d-tacq solutions ltd
-002155 cisco systems
-002156 cisco systems
+002155 cisco systems, inc.
+002156 cisco systems, inc.
 002157 national datacast, inc.
 002158 style flying technology co.
 002159 juniper networks
@@ -8591,8 +8592,8 @@
 00219d adesys bv
 00219e sony ericsson mobile communications
 00219f satel oy
-0021a0 cisco systems
-0021a1 cisco systems
+0021a0 cisco systems, inc.
+0021a1 cisco systems, inc.
 0021a2 eke-electronics ltd.
 0021a3 micromint
 0021a4 dbii networks
@@ -8646,8 +8647,8 @@
 0021d4 vollmer werke gmbh
 0021d5 x2e gmbh
 0021d6 lxi consortium
-0021d7 cisco systems
-0021d8 cisco systems
+0021d7 cisco systems, inc.
+0021d8 cisco systems, inc.
 0021d9 sekonic corporation
 0021da automation products group inc.
 0021db santachi video technology (shenzhen) co., ltd.
@@ -8689,7 +8690,7 @@
 0021ff cyfrowy polsat sa
 002200 ibm corp
 002201 aksys networks inc
-002202 excito elektronik i skåne ab
+002202 excito elektronik i skåne ab
 002203 glensound electronics ltd
 002204 koratek
 002205 welink solutions, inc.
@@ -8699,8 +8700,8 @@
 002209 omron healthcare co., ltd
 00220a onlive, inc
 00220b national source coding center
-00220c cisco systems
-00220d cisco systems
+00220c cisco systems, inc.
+00220d cisco systems, inc.
 00220e indigo security co., ltd.
 00220f moca (multimedia over coax alliance)
 002210 motorola mobility, inc.
@@ -8772,8 +8773,8 @@
 002252 zoll lifecor corporation
 002253 entorian technologies
 002254 bigelow aerospace
-002255 cisco systems
-002256 cisco systems
+002255 cisco systems, inc.
+002256 cisco systems, inc.
 002257 3com europe ltd
 002258 taiyo yuden co., ltd.
 002259 guangzhou new postcom equipment co.,ltd.
@@ -8800,11 +8801,11 @@
 00226e gowell electronic limited
 00226f 3onedata technology co. ltd.
 002270 abk north america, llc
-002271 jäger computergesteuerte messtechnik gmbh
+002271 jäger computergesteuerte meßtechnik gmbh.
 002272 american micro-fuel device corp.
 002273 techway
 002274 familyphone ab
-002275 belkin international, inc.
+002275 belkin international inc.
 002276 triple eye b.v.
 002277 nec australia pty ltd
 002278 shenzhen  tongfang multimedia  technology co.,ltd.
@@ -8816,8 +8817,8 @@
 00227e chengdu 30kaitian communication industry co.ltd
 00227f ruckus wireless
 002280 a2b electronics ab
-002281 daintree networks inc
-002282 8086 limited
+002281 daintree networks pty
+002282 8086 consultancy
 002283 juniper networks
 002284 desay a&v science and technology co.,ltd
 002285 nomus comm systems
@@ -8831,8 +8832,8 @@
 00228d gbs laboratories llc
 00228e tv-numeric
 00228f cnrs
-002290 cisco systems
-002291 cisco systems
+002290 cisco systems, inc.
+002291 cisco systems, inc.
 002292 cinetal
 002293 zte corporation
 002294 kyocera corporation
@@ -8876,18 +8877,18 @@
 0022ba huth elektronik systeme gmbh
 0022bb beyerdynamic gmbh & co. kg
 0022bc jdsu france sas
-0022bd cisco systems
-0022be cisco systems
+0022bd cisco systems, inc.
+0022be cisco systems, inc.
 0022bf sieamp group of companies
 0022c0 shenzhen forcelink electronic co, ltd
 0022c1 active storage inc.
-0022c2 proview eletronica do brasil ltda
+0022c2 proview eletrônica do brasil ltda
 0022c3 zeeport technology inc.
 0022c4 epro gmbh
 0022c5 inforson co,ltd.
 0022c6 sutus inc
 0022c7 segger microcontroller gmbh & co. kg
-0022c8 applied instruments
+0022c8 applied instruments b.v.
 0022c9 lenord, bauer & co gmbh
 0022ca anviz biometric tech. co., ltd.
 0022cb ionodes inc.
@@ -8897,7 +8898,7 @@
 0022cf planex communications inc
 0022d0 polar electro oy
 0022d1 albrecht jung gmbh & co. kg
-0022d2 all earth comércio de eletrônicos ltda.
+0022d2 all earth comércio de eletrônicos ltda.
 0022d3 hub-tech
 0022d4 comworth co., ltd.
 0022d5 eaton corp. electrical group data center solutions - pulizzi
@@ -8947,8 +8948,8 @@
 002301 witron technology limited
 002302 cobalt digital, inc.
 002303 lite-on it corporation
-002304 cisco systems
-002305 cisco systems
+002304 cisco systems, inc.
+002305 cisco systems, inc.
 002306 alps electric co., ltd
 002307 future innovation tech co.,ltd
 002308 arcadyan technology corporation
@@ -8994,8 +8995,8 @@
 002330 dizipia, inc.
 002331 nintendo co., ltd.
 002332 apple, inc
-002333 cisco systems
-002334 cisco systems
+002333 cisco systems, inc.
+002334 cisco systems, inc.
 002335 linkflex co.,ltd
 002336 metel s.r.o.
 002337 global star solutions ulc
@@ -9036,8 +9037,8 @@
 00235a compal information (kunshan) co., ltd.
 00235b gulfstream
 00235c aprius, inc.
-00235d cisco systems
-00235e cisco systems
+00235d cisco systems, inc.
+00235e cisco systems, inc.
 00235f silicon micro sensors gmbh
 002360 lookit technology co., ltd
 002361 unigen corporation
@@ -9097,12 +9098,12 @@
 002397 westell technologies inc.
 002398 sky control
 002399 vd division, samsung electronics co.
-00239a easydata software gmbh
+00239a easydata hardware gmbh
 00239b elster solutions, llc
 00239c juniper networks
 00239d mapower electronics co., ltd
 00239e jiangsu lemote technology corporation limited
-00239f institut für prüftechnik
+00239f institut für prüftechnik
 0023a0 hana cns co., ltd.
 0023a1 trend electronics ltd
 0023a2 motorola mobility, inc.
@@ -9114,8 +9115,8 @@
 0023a8 marshall electronics
 0023a9 beijing detianquan electromechanical equipment co., ltd
 0023aa hfr, inc.
-0023ab cisco systems
-0023ac cisco systems
+0023ab cisco systems, inc.
+0023ac cisco systems, inc.
 0023ad xmark corporation
 0023ae dell inc.
 0023af motorola mobility, inc.
@@ -9177,8 +9178,8 @@
 0023e7 hinke a/s
 0023e8 demco corp.
 0023e9 f5 networks, inc.
-0023ea cisco systems
-0023eb cisco systems
+0023ea cisco systems, inc.
+0023eb cisco systems, inc.
 0023ec algorithmix gmbh
 0023ed motorola chs
 0023ee motorola mobility, inc.
@@ -9218,8 +9219,8 @@
 002410 nueteq technology,inc.
 002411 pharmasmart llc
 002412 benign technologies co, ltd.
-002413 cisco systems
-002414 cisco systems
+002413 cisco systems, inc.
+002414 cisco systems, inc.
 002415 magnetic autocontrol gmbh
 002416 any use
 002417 thomson telecom belgium
@@ -9277,8 +9278,8 @@
 00244d hokkaido electronics corporation
 00244e radchips, inc.
 00244f asantron technologies ltd.
-002450 cisco systems
-002451 cisco systems
+002450 cisco systems, inc.
+002451 cisco systems, inc.
 002452 silicon software gmbh
 002453 initra d.o.o.
 002454 samsung electronics co., ltd
@@ -9347,8 +9348,8 @@
 002494 shenzhen baoxin tech co., ltd.
 002495 motorola mobility, inc.
 002496 ginzinger electronic systems
-002497 cisco systems
-002498 cisco systems
+002497 cisco systems, inc.
+002498 cisco systems, inc.
 002499 aquila technologies
 00249a beijing zhongchuang telecommunication test co., ltd.
 00249b action star enterprise co., ltd.
@@ -9391,8 +9392,8 @@
 0024c0 nti comodo inc
 0024c1 motorola mobility, inc.
 0024c2 asumo co.,ltd.
-0024c3 cisco systems
-0024c4 cisco systems
+0024c3 cisco systems, inc.
+0024c4 cisco systems, inc.
 0024c5 meridian audio limited
 0024c6 hager electro sas
 0024c7 mobilarm ltd
@@ -9443,9 +9444,9 @@
 0024f4 kaminario technologies ltd.
 0024f5 nds surgical imaging
 0024f6 miyoshi electronics corporation
-0024f7 cisco systems
+0024f7 cisco systems, inc.
 0024f8 technical solutions company ltd.
-0024f9 cisco systems
+0024f9 cisco systems, inc.
 0024fa hilger u. kern gmbh
 0024fb 
 0024fc quopin co., ltd.
@@ -9519,8 +9520,8 @@
 002542 pittasoft
 002543 moneytech
 002544 lojack corporation
-002545 cisco systems
-002546 cisco systems
+002545 cisco systems, inc.
+002546 cisco systems, inc.
 002547 nokia danmark a/s
 002548 nokia danmark a/s
 002549 jeorich tech. co.,ltd.
@@ -9572,7 +9573,7 @@
 002577 d-box technologies
 002578 jsc "concern "sozvezdie"
 002579 j & f labs
-00257a camco produktions- und vertriebs-gmbh für beschallungs- und beleuchtungsanlagen
+00257a camco produktions- und vertriebs-gmbh für  beschallungs- und beleuchtungsanlagen
 00257b stj  electronics  pvt  ltd
 00257c huachentel technology development co., ltd
 00257d pointred telecom private ltd.
@@ -9581,8 +9582,8 @@
 002580 equipson s.a.
 002581 x-star networks inc.
 002582 maksat technologies (p) ltd
-002583 cisco systems
-002584 cisco systems
+002583 cisco systems, inc.
+002584 cisco systems, inc.
 002585 kokuyo s&t co., ltd.
 002586 tp-link technologies co., ltd.
 002587 vitality, inc.
@@ -9628,10 +9629,10 @@
 0025af comfile technology
 0025b0 schmartz inc
 0025b1 maya-creation corporation
-0025b2 lfk-lenkflugkörpersysteme gmbh
+0025b2 lfk-lenkflugkörpersysteme gmbh
 0025b3 hewlett-packard company
-0025b4 cisco systems
-0025b5 cisco systems
+0025b4 cisco systems, inc.
+0025b5 cisco systems, inc.
 0025b6 telecom fm
 0025b7 costar  electronics, inc.,
 0025b8 agile communications, inc.
@@ -9659,7 +9660,7 @@
 0025ce innerspace
 0025cf nokia danmark a/s
 0025d0 nokia danmark a/s
-0025d1 eastech electronics (taiwan) inc.
+0025d1 eastern asia technology limited
 0025d2 inpegvision co., ltd
 0025d3 azurewave technologies, inc
 0025d4 fortress technologies
@@ -9693,7 +9694,7 @@
 0025f0 suga electronics limited
 0025f1 motorola mobility, inc.
 0025f2 motorola mobility, inc.
-0025f3 nordwestdeutsche zählerrevision
+0025f3 nordwestdeutsche zählerrevision
 0025f4 koco connector ag
 0025f5 dvs korea, co., ltd
 0025f6 nettalk.com, inc.
@@ -9704,7 +9705,7 @@
 0025fc enda endustriyel elektronik ltd. sti.
 0025fd obr centrum techniki morskiej s.a.
 0025fe pilot electronics corporation
-0025ff crenova technology gmbh
+0025ff crenova multimedia co., ltd
 002600 teac australia pty ltd.
 002601 cutera inc
 002602 smart temps llc
@@ -9715,8 +9716,8 @@
 002607 enabling technology pty ltd
 002608 apple, inc
 002609 phyllis co., ltd.
-00260a cisco systems
-00260b cisco systems
+00260a cisco systems, inc.
+00260b cisco systems, inc.
 00260c dataram
 00260d micronetics, inc.
 00260e ablaze systems, llc
@@ -9745,7 +9746,7 @@
 002625 mediasputnik
 002626 geophysical survey systems, inc.
 002627 truesell
-002628 companytec automação e controle ltda
+002628 companytec automação e controle ltda.
 002629 juphoon system software inc.
 00262a proxense, llc
 00262b wongs electronics co. ltd.
@@ -9765,7 +9766,7 @@
 002639 t.m. electronics, inc.
 00263a digitec systems
 00263b onbnetech
-00263c bachmann gmbh & co. kg
+00263c bachmann technology gmbh & co. kg
 00263d mia corporation
 00263e trapeze networks
 00263f lios technology gmbh
@@ -9782,10 +9783,10 @@
 00264c shanghai digivision technology co., ltd.
 00264d arcadyan technology corporation
 00264e rail & road protec gmbh
-00264f krüger&gothe gmbh
+00264f krüger &gothe gmbh
 002650 2wire
-002651 cisco systems
-002652 cisco systems
+002651 cisco systems, inc.
+002652 cisco systems, inc.
 002653 daysequerra corporation
 002654 3com corporation
 002655 hewlett-packard company
@@ -9826,7 +9827,7 @@
 002678 logic instrument sa
 002679 euphonic technologies, inc.
 00267a wuhan hongxin telecommunication technologies co.,ltd
-00267b gsi helmholtzzentrum für schwerionenforschung gmbh
+00267b gsi helmholtzzentrum für schwerionenforschung gmbh
 00267c metz-werke gmbh & co kg
 00267d a-max technology macao commercial offshore company limited
 00267e parrot sa
@@ -9855,8 +9856,8 @@
 002695 zt group int'l inc
 002696 noolix co., ltd
 002697 cheetah technologies, l.p.
-002698 cisco systems
-002699 cisco systems
+002698 cisco systems, inc.
+002699 cisco systems, inc.
 00269a carina system co., ltd.
 00269b sokrat ltd.
 00269c itus japan co. ltd
@@ -9905,8 +9906,8 @@
 0026c7 intel corporate
 0026c8 system sensor
 0026c9 proventix systems, inc.
-0026ca cisco systems
-0026cb cisco systems
+0026ca cisco systems, inc.
+0026cb cisco systems, inc.
 0026cc nokia danmark a/s
 0026cd purplecomm, inc.
 0026ce kozumi usa corp.
@@ -9971,8 +9972,8 @@
 002709 nintendo co., ltd.
 00270a iee s.a.
 00270b adura technologies
-00270c cisco systems
-00270d cisco systems
+00270c cisco systems, inc.
+00270d cisco systems, inc.
 00270e intel corporate
 00270f envisionnovation inc
 002710 intel corporate
@@ -9994,8 +9995,8 @@
 002720 new-sol com
 002721 shenzhen baoan fenda industrial co., ltd
 002722 ubiquiti networks
-0027f8 brocade communications systems, inc
-002a6a cisco systems
+0027f8 brocade communications systems, inc.
+002a6a cisco systems, inc.
 002aaf larsys-automation gmbh
 002d76 titech gmbh
 003000 allwell technology corp.
@@ -10210,7 +10211,7 @@
 0030d1 inova corporation
 0030d2 win technologies, co., ltd.
 0030d3 agilent technologies
-0030d4 aae systems, inc
+0030d4 aae systems, inc.
 0030d5 dresearch gmbh
 0030d6 msc vertriebs gmbh
 0030d7 innovative systems, l.l.c.
@@ -10260,11 +10261,11 @@
 0036f8 conti temic microelectronic gmbh
 0036fe supervision
 00376d murata manufacturing co., ltd.
-003a98 cisco systems
-003a99 cisco systems
-003a9a cisco systems
-003a9b cisco systems
-003a9c cisco systems
+003a98 cisco systems, inc.
+003a99 cisco systems, inc.
+003a9a cisco systems, inc.
+003a9b cisco systems, inc.
+003a9c cisco systems, inc.
 003a9d nec accesstechnica, ltd.
 003aaf bluebit ltd.
 003cc5 wonwoo engineering co., ltd
@@ -10420,7 +10421,7 @@
 004093 paxdata networks ltd.
 004094 shographics, inc.
 004095 r.p.t. intergroups int'l ltd.
-004096 cisco systems, inc.
+004096 cisco systems
 004097 datex division of
 004098 dressler gmbh & co.
 004099 newgen systems corp.
@@ -10695,11 +10696,11 @@
 0050ab naltec, inc.
 0050ac maple computer corporation
 0050ad communique wireless corp.
-0050ae iwaki electronics co., ltd.
+0050ae fdk co., ltd
 0050af intergon, inc.
 0050b0 technology atlanta corporation
 0050b1 giddings & lewis
-0050b2 brodel automation
+0050b2 brodel gmbh
 0050b3 voiceboard corporation
 0050b4 satchwell control systems, ltd
 0050b5 fichet-bauche
@@ -10715,7 +10716,7 @@
 0050bf metalligence technology corp.
 0050c0 gatan, inc.
 0050c1 gemflex networks, ltd.
-0050c2 ieee registration authority
+0050c2 ieee registration authority  - please see iab public listing for more information.
 0050c4 imd
 0050c5 ads technologies, inc
 0050c6 loop telecommunication international, inc.
@@ -10773,6 +10774,7 @@
 0050ff hakko electronics co., ltd.
 005218 wuxi keboda electron co.ltd
 0054af continental automotive systems inc.
+005907 lenovoemc products usa, llc
 005cb1 gospell digital technology co., ltd
 005d03 xilinx, inc
 006000 xycom inc.
@@ -11031,8 +11033,9 @@
 0060fd netics, inc.
 0060fe lynx system developers, inc.
 0060ff quvis, inc.
-006440 cisco systems
+006440 cisco systems, inc.
 0064a6 maquet cardiovascular
+00664b huawei technologies co., ltd
 006b9e vizio inc
 006ba0 shenzhen universal intellisys pte ltd
 006dfb vutrix (uk) ltd
@@ -11859,7 +11862,7 @@
 00b0ce technology rescue
 00b0d0 dell computer corp.
 00b0db nextcell, inc.
-00b0df reldata inc
+00b0df starboard storage systems
 00b0e7 british federal ltd.
 00b0ec eacem
 00b0ee ajile systems, inc.
@@ -11872,6 +11875,7 @@
 00b9f6 shenzhen super rich electronics co.,ltd
 00bac0 biometric access company
 00bb01 octothorpe corp.
+00bb3a 
 00bb8e hme co., ltd.
 00bbf0 ungermann-bass inc.
 00bd27 exar corp.
@@ -12090,7 +12094,7 @@
 00c0d2 syntellect, inc.
 00c0d3 olympus image systems, inc.
 00c0d4 axon networks, inc.
-00c0d5 werbeagentur jürgen siebert
+00c0d5 werbeagentur jürgen siebert
 00c0d6 j1 systems, inc.
 00c0d7 taiwan trading center dba
 00c0d8 universal data systems
@@ -12133,6 +12137,7 @@
 00c0fd prosum
 00c0fe aptec computer systems, inc.
 00c0ff dot hill systems corporation
+00c14f ddl co,.ltd.
 00c2c6 intel corporate
 00c610 apple, inc.
 00cbbd cambridge broadband networks ltd.
@@ -12277,7 +12282,7 @@
 00d088 motorola, inc.
 00d089 dynacolor, inc.
 00d08a photron usa
-00d08b adva optical networking ltd
+00d08b adva optical networking ltd.
 00d08c genoa technology, inc.
 00d08d phoenix group, inc.
 00d08e nvision inc.
@@ -12416,7 +12421,7 @@
 00dd0d ungermann-bass inc.
 00dd0e ungermann-bass inc.
 00dd0f ungermann-bass inc.
-00defb cisco systems
+00defb cisco systems, inc.
 00e000 fujitsu limited
 00e001 strand lighting limited
 00e002 crossroads systems, inc.
@@ -12551,7 +12556,7 @@
 00e083 jato technologies, inc.
 00e084 compulite r&d
 00e085 global maintech, inc.
-00e086 cybex computer products
+00e086 emerson network power, avocent division
 00e087 lecroy - networking productions division
 00e088 ltx corporation
 00e089 ion networks, inc.
@@ -12677,6 +12682,7 @@
 00e666 arima communications corp.
 00e6d3 nixdorf computer corp.
 00e8ab meggitt training systems, inc.
+00eb2d sony mobile communications ab
 00f051 kwb gmbh
 00f403 orbis systems oy
 00f4b9 apple, inc.
@@ -12702,6 +12708,7 @@
 040ae0 xmit ag computer networks
 040cce apple, inc.
 040ec2 viewsonic mobile china limited
+041552 apple
 04180f samsung electronics co.,ltd
 0418b6 
 0418d6 ubiquiti networks
@@ -12709,7 +12716,8 @@
 041e64 apple, inc
 04209a panasonic avc networks company
 042234 wireless standard extensions
-042605 gfr gesellschaft für regelungstechnik und energieeinsparung mbh
+042605 gfr gesellschaft für regelungstechnik und energieeinsparung mbh
+042665 apple
 042bbb picocela, inc.
 042f56 atocs (shenzhen) ltd
 0432f4 partron
@@ -12717,12 +12725,15 @@
 044665 murata manufacturing co., ltd.
 044a50 ramaxel technology (shenzhen) limited company
 044bff guangzhou hedy digital technology co., ltd
+044cef fujian sanao technology co.,ltd
 044faa ruckus wireless
 045453 apple, inc.
 0455ca briview (xiamen) corp.
+04586f sichuan whayer information industry co.,ltd
 045a95 nokia corporation
 045c06 zmodo technology corporation
 045d56 camtron industrial inc.
+045fa7 shenzhen yichen technology development co.,ltd
 0462d7 alstom hydro france
 0463e0 nome oy
 046d42 bryston ltd.
@@ -12745,17 +12756,19 @@
 04a82a nokia corporation
 04b3b6 seamap (uk) ltd
 04b466 bsp co., ltd.
+04bfa8 isb corporation
 04c05b tigo energy
 04c06f huawei device co., ltd
 04c1b9 fiberhome telecommunication tech.co.,ltd.
-04c5a4 cisco systems
+04c5a4 cisco systems, inc.
 04c880 samtec inc
 04ce14 wilocity ltd.
 04d783 y&h e&c co.,ltd.
+04dad2 cisco
 04dd4c ipblaze
 04e0c4 triumph-adler ag
-04e1c8 ims soluções em energia ltda.
-04e2f8 aep srl
+04e1c8 ims soluções em energia ltda.
+04e2f8 aep ticketing solutions srl
 04e451 texas instruments
 04e548 cohda wireless pty ltd
 04e662 acroname inc.
@@ -12767,7 +12780,7 @@
 04f7e4 apple
 04f8c2 flaircomm microelectronics, inc.
 04fe31 samsung electronics co.,ltd
-04fe7f cisco systems
+04fe7f cisco systems, inc.
 04ff51 novamedia innovision sp. z o.o.
 080001 computervision corporation
 080002 bridge communications inc.
@@ -12912,37 +12925,47 @@
 08008e tandem computers
 08008f chipcom corporation
 080090 sonoma systems
+0808c2 samsung electronics
 0808ea amsc
 080c0b sysmik gmbh dresden
 080cc9 mission technology group, dba magma
 080d84 geco, inc.
+080ea8 velex s.r.l.
 080ffa ksp inc.
 081196 intel corporate
 081443 unibrain s.a.
 081651 shenzhen sea star technology co.,ltd
-081735 cisco systems
+081735 cisco systems, inc.
 0817f4 ibm corp
 08181a zte corporation
 08184c a. s. thomas, inc.
 0819a6 huawei technologies co.,ltd
-081ff3 cisco systems
+081dfb shanghai mexon communication technology co.,ltd
+081f3f wondalink inc.
+081ff3 cisco systems, inc.
 082522 advansee
 082ad0 srd innovations inc.
 082e5f hewlett packard
+08373d samsung electronics co.,ltd
 08379c topaz co. ltd.
 0838a5 funkwerk plettac electronic gmbh
 083ab8 shinoda plasma co., ltd.
 083e8e hon hai precision ind.co.ltd
+08482c raycore taiwan co., ltd.
 084e1c h2a systems, llc
 084ebf broad net mux corporation
 08512e orion diagnostica oy
 085b0e fortinet, inc.
 08606e asustek computer inc.
+086361 huawei technologies co., ltd
+0868d0 japan system design
 0868ea eito electronics co., ltd.
 087572 obelux oy
 087618 vie technologies sdn. bhd.
 087695 auto industrial co., ltd.
 0876ff thomson telecom belgium
+087999 aim gmbh
+087a4c huawei technologies co., ltd
 087baa svyazkomplektservice, llc
 087cbe quintic corp.
 087d21 altasec technology corporation
@@ -12961,7 +12984,8 @@
 08b7ec wireless seismic
 08bbcc ak-nord edv vertriebsges. mbh
 08be09 astrol electronic ag
-08d09f cisco systems
+08cc68 cisco
+08d09f cisco systems, inc.
 08d29a proformatique
 08d40c intel corporate
 08d42b samsung electronics
@@ -12977,6 +13001,9 @@
 08f6f8 get engineering
 08fae0 fohhn audio ag
 08fc52 openxs bv
+08fc88 samsung electronics co.,ltd
+0c0400 jantar d.o.o.
+0c1105 ringslink (xiamen) network communication technologies co., ltd
 0c130b uniqoteq ltd.
 0c1420 samsung electronics co.,ltd
 0c15c5 sdtec co., ltd.
@@ -12985,32 +13012,38 @@
 0c1dc2 seah networks
 0c2755 valuable techologies limited
 0c2a69 electric imp, incorporated
+0c2ae7 beijing general research institute of mining and metallurgy
 0c37dc huawei technologies co., ltd
 0c3956 observator instruments
 0c3c65 dome imaging inc
 0c469d ms sedco
 0c4c39 mitrastar technology
 0c51f7 chauvin arnoux
+0c5521 axiros gmbh
 0c565c hybroad vision (hong kong) technology co ltd
 0c57eb mueller systems
 0c5a19 axtion sdn bhd
 0c6076 hon hai precision ind. co.,ltd.
 0c6e4f primevolt co., ltd.
 0c715d samsung electronics co.,ltd
+0c722c tp-link technologies co.,ltd.
 0c74c2 apple, inc.
 0c7523 beijing gehua catv network co.,ltd
 0c771a apple, inc.
 0c7d7c kexiang information technology co, ltd.
 0c8112 
 0c8230 shenzhen magnus technologies co.,ltd
+0c8268 tp-link technologies co.,ltd.
 0c826a wuhan huagong genuine optics technology co., ltd
 0c8411 a.o. smith water products
-0c8525 cisco systems
+0c8484 zenovia electronics inc.
+0c8525 cisco systems, inc.
 0c8bfd intel corporate
 0c8cdc suunto oy
 0c8d98 top eight ind corp
 0c924e rice lake weighing systems
 0c93fb bns solutions
+0c96bf huawei technologies co., ltd
 0c9d56 consort controls ltd
 0c9e91 sankosha corporation
 0ca138 blinq wireless inc.
@@ -13034,7 +13067,7 @@
 0cd502 westell
 0cd696 amimon ltd
 0cd7c2 axium technologies, inc.
-0cd996 cisco systems
+0cd996 cisco systems, inc.
 0cd9c1 johnson controls-asg
 0cda41 hangzhou h3c technologies co., limited
 0cdccc inala technologies
@@ -13049,6 +13082,7 @@
 0cf0b4 globalsat international technology ltd
 0cf361 java information
 0cf3ee em microelectronic
+0cf405 beijing signalway technologies co.,ltd
 0cf893 arris group, inc.
 0cfc83 airoha technology corp.,
 100000 
@@ -13068,12 +13102,15 @@
 1013ee justec international technology inc.
 10189e elmo motion control
 101b54 huawei technologies co.,ltd
+101c0c apple
 101d51 on-q llc dba on-q mesh networks
 101dc0 samsung electronics co.,ltd
 101f74 hewlett-packard company
+102831 morion inc.
 102d96 looxcie inc.
 102eaf texas instruments
 103711 simlink as
+103dea hfc technology (beijing) ltd. co.
 1040f3 apple, inc.
 104369 soundmax electronic limited
 10445a shaanxi hitech electronic co., ltd
@@ -13081,23 +13118,27 @@
 1045f8 lnt-automation gmbh
 104780 huawei technologies co.,ltd
 1048b1 beijing duokan technology limited
+104d77 innovative computer engineering
 1056ca peplink international ltd.
 105cbf durobyte inc
+105f06 actiontec electronics, inc
 105f49 cisco spvtg
 10604b hewlett packard
 1062c9 adatis gmbh & co. kg
 1064e2 adfweb.com s.r.l.
 1065a3 panamax inc.
 1065cf iqsim
+106682 nec accesstechnica, ltd.
 10683f lg electronics
 106f3f buffalo inc.
 106fef ad-sol nissin corp
 1071f9 cloud telecomputers, llc
 10768a eocell
+1077b1 samsung electronics co.,ltd
 1078d2 elitegroup computer system co., ltd.
 1083d2 microseven systems, llc
-10880f daruma telecomunicaÇÕes e informÁtica s/a
-108ccf cisco systems
+10880f daruma telecomunicações e informática s.a.
+108ccf cisco systems, inc.
 1093e9 apple, inc.
 109add apple, inc.
 109fa9 actiontec electronics, inc
@@ -13105,8 +13146,9 @@
 10a743 sk mtek limited
 10a932 beijing cyber cloud technology co. ,ltd.
 10b7f6 plastoform industries ltd.
+10b9fe lika srl
 10baa5 gana i&c co., ltd
-10bd18 cisco systems
+10bd18 cisco systems, inc.
 10bf48 asustek computer inc.
 10c2ba utt co., ltd.
 10c586 bio sound lab co., ltd.
@@ -13116,6 +13158,7 @@
 10ca81 precia
 10ccdb aximum produits electroniques
 10d1dc instar deutschland gmbh
+10d542 samsung electronics co.,ltd
 10ddb1 apple
 10e2d5 qi hardware inc.
 10e3c7 seohwa telecom
@@ -13124,6 +13167,7 @@
 10e8ee phasespace
 10ea59 cisco spvtg
 10eed9 canoga perkins corporation
+10f311 cisco
 10f3db gridco systems, inc.
 10f49a t3 innovation
 10f96f lg electronics
@@ -13136,10 +13180,12 @@
 1407e0 abrantix ag
 140c76 freebox sas
 14109f apple inc
+141330 anakreon uk llp
 14144b fujian star-net communication co.,ltd
 141a51 treetech sistemas digitais
 141bbd volex inc.
 141bf0 intellimedia systems ltd
+1423d7 eutronix co., ltd.
 142df5 amphitech
 14307a avermetrics
 14358b mediabridge products, llc.
@@ -13148,6 +13194,7 @@
 14373b procom systems
 143aea dynapower company llc
 143e60 alcatel-lucent
+1441e2 monaco enterprises, inc.
 144319 creative&link technology limited
 144978 digital control incorporated
 144c1a max communication gmbh
@@ -13162,10 +13209,12 @@
 147db3 joa telecom.co.,ltd
 147dc5 murata manufacturing co., ltd.
 14825b hefei radio communication technology co., ltd
+148692 tp-link technologies co.,ltd.
 1489fd samsung electronics
 148a70 ads gmbh
 148fc6 apple, inc.
 149090 kongtop industrial(shen zhen)co.,ltd
+149448 blu castle s.a.
 149fe8 lenovo mobile communication technology ltd.
 14a62c s.m. dezac s.a.
 14a86b shenzhen telacom science&technology co., ltd
@@ -13189,6 +13238,7 @@
 14feaf sagittar limited
 14feb5 dell inc
 18002d sony mobile communications ab
+1800db fitbit inc.
 1801e3 elektrobit wireless communications ltd
 180373 dell inc
 1803fa ibt interfaces
@@ -13199,13 +13249,15 @@
 181420 teb sas
 181456 nokia corporation
 181714 daewoois
+181725 cameo communications, inc.
 18193f tamtron oy
 182032 apple, inc.
 182861 airties wireless networks
 182a7b nintendo co., ltd.
 182b05 8d technologies
 182c91 concept development, inc.
-18339d cisco systems
+1832a2 laon technology co., ltd.
+18339d cisco systems, inc.
 183451 apple, inc.
 183825 wuhan lingjiu high-tech co.,ltd.
 183919 unicoi systems
@@ -13218,16 +13270,20 @@
 1848d8 fastback networks
 184e94 messoa technologies inc.
 185253 pixord corporation
+1853e0 hanyang digitech co.ltd
 18550f cisco spvtg
 185933 cisco spvtg
+185ae8 zenotech.co.,ltd
 1866e3 veros systems, inc.
 18673f hanover displays limited
 186751 komeg industrielle messtechnik gmbh
+1867b0 samsung electronics co.,ltd
 186d99 adanis inc.
 187a93 amiccom electronics corporation
 187c81 valeo vision systems
 1880ce barberry solutions ltd
 1880f5 alcatel-lucent shanghai bell co., ltd
+188410 coretrust inc.
 18863a digital art system
 1886ac nokia danmark a/s
 188796 htc corporation
@@ -13251,14 +13307,17 @@
 18d071 dasan smc, inc.
 18d66a inmarsat
 18d949 qvis labs, llc
+18dc56 yulong computer telecommunication scientific(shenzhen)co.,lt
 18e288 stt condigi
 18e2c2 samsung electronics
 18e7f4 apple, inc.
 18e80f viking electronics inc.
-18ef63 cisco systems
+18e8dd moduletek
+18ef63 cisco systems, inc.
 18f46a hon hai precision ind. co.,ltd.
 18f650 multimedia pacific limited
 18f87a i3 international inc.
+18fa6f isc applied systems corp
 18fc9f changhe electronics co., ltd.
 1c0656 idy corporation
 1c0b52 epicom s.a
@@ -13266,15 +13325,17 @@
 1c11e1 wartsila finland oy
 1c129d ieee pes psrc/sub
 1c1448 motorola mobility, inc.
-1c17d3 cisco systems
+1c17d3 cisco systems, inc.
 1c184a shenzhen richerlink technologies co.,ltd
 1c19de eyevis gmbh
 1c1d67 huawei device co., ltd
 1c334d its telecom
 1c3477 innovation wireless
 1c35f1 new lift neue elektronische wege steuerungsbau gmbh
+1c37bf cloudium systems ltd.
 1c3a4f accuspec electronics, llc
 1c3de7 sigma koki co.,ltd.
+1c3e84 hon hai precision ind. co.,ltd.
 1c43ec japan circuit co.,ltd
 1c4593 texas instruments
 1c4bd6 azurewave
@@ -13293,6 +13354,7 @@
 1c6bca mitsunami co., ltd.
 1c6f65 giga-byte technology co.,ltd.
 1c7508 compal information (kunshan) co., ltd.
+1c76ca terasic technologies inc.
 1c7c11 eid
 1c7c45 vitek industrial video products, inc.
 1c7ee5 d-link international
@@ -13305,12 +13367,13 @@
 1c955d i-lax electronics inc.
 1c959f veethree electronics and marine llc
 1c973d pricom design
-1caa07 cisco systems
+1caa07 cisco systems, inc.
 1caba7 apple, inc.
 1caff7 d-link international pte limited
 1cb094 htc corporation
 1cb17f nec accesstechnica, ltd.
 1cb243 tdc a/s
+1cba8c texas instruments
 1cbba8 ojsc "ufimskiy zavod "promsvyaz"
 1cbd0e amplified engineering pty ltd
 1cbdb9 d-link international pte limited
@@ -13318,7 +13381,7 @@
 1cc316 milesight technology co., ltd.
 1cc63c arcadyan technology corporation
 1cd40c kriwan industrie-elektronik gmbh
-1cdf0f cisco systems
+1cdf0f cisco systems, inc.
 1ce165 marshal corporation
 1ce192 qisda corporation
 1ce2cc texas instruments
@@ -13326,6 +13389,7 @@
 1cf061 scaps gmbh
 1cf4ca 
 1cf5e7 turtle industry co., ltd.
+1cfa68 tp-link technologies co.,ltd.
 1cfea7 identytech solutins ltd.
 20014f linea research ltd
 2002af murata manufactuaring co.,ltd.
@@ -13336,11 +13400,12 @@
 201257 most lucky trading ltd
 2013e0 samsung electronics co.,ltd
 2016d8 liteon technology corporation
+201a06 compal information (kunshan) co., ltd.
 2021a5 lg electronics inc
 202598 teleview
 202bc1 huawei device co., ltd
 202cb7 kong yue electronics & information industry (xinhui) ltd.
-203706 cisco systems
+203706 cisco systems, inc.
 2037bc kuipers electronic engineering bv
 203a07 cisco
 204005 feno gmbh
@@ -13349,6 +13414,7 @@
 2046a1 vecow co., ltd
 2046f9 advanced network devices (dba:and)
 204aaa hanscan spain s.a.
+204c6d hugo brennenstuhl gmbh & co. kg.
 204e6b axxana(israel) ltd
 204e7f netgear
 205476 sony mobile communications ab
@@ -13365,9 +13431,11 @@
 2074cf shenzhen voxtech co.,ltd
 207600 actiontec electronics, inc
 207c8f quanta microsystems,inc.
+207d74 apple
 20858c assa
 208984 compal information (kunshan) co., ltd
-2091d9 i'm spa
+20918a profalux
+2091d9 i'm spa
 209ba5 jiaxing glead electronics co.,ltd
 20a2e7 lee-dickens ltd
 20aa25 ip-net llc
@@ -13376,6 +13444,7 @@
 20b399 enterasys
 20b5c6 mimosa networks
 20b7c0 omicron electronics gmbh
+20bbc0 cisco
 20bbc6 jabil circuit hungary ltd.
 20bfdb dvl
 20c1af i wit digital co., limited
@@ -13400,6 +13469,7 @@
 20fedb m2m solution s.a.s.
 2401c7 cisco
 240917 devlin electronics limited
+240a64 azurewavetechnologies,inc
 240b2a viettel group
 240bb1 kostal industrie elektrik gmbh
 241064 shenzhen ecsino tecnical co. ltd
@@ -13417,21 +13487,25 @@
 24470e pentronicab
 24497b innovative converged devices inc
 245fdf kyocera corporation
+246278 sysmocom - systems for mobile communications gmbh
 246511 avm gmbh
 24694a jasmine systems inc.
+2469a5 huawei technologies co., ltd
 24767d cisco spvtg
 247703 intel corporate
+2481aa ksh international co., ltd.
 24828a prowave technologies ltd.
 2486f4 ctek, inc.
 248707 senergy corporation
 249442 open road solutions , inc.
+249504 sfr
 24a42c koukaam a.s.
 24a43c ubiquiti networks, inc
 24a937 pure storage
 24ab81 apple, inc.
 24af4a alcatel-lucent-ipd
 24af54 nexgen mediatech inc.
-24b657 cisco systems
+24b657 cisco systems, inc.
 24b6b8 friem spa
 24b6fd dell inc
 24b88c crenus co.,ltd.
@@ -13448,11 +13522,13 @@
 24cf21 shenzhen state micro technology co., ltd
 24d2cc smartdrive systems inc.
 24d921 avaya, inc
-24dab6 sistemas de gestión energética s.a. de c.v.
+24dab6 sistemas de gestión energética s.a. de c.v
 24dbac huawei device co., ltd
 24dbad shoppertrak rct corporation
 24dec6 aruba networks
 24e6ba jsc zavod im. kozitsky
+24ea40 systeme helmholz gmbh
+24eb65 saet i.s. s.r.l.
 24ec99 askey computer corp
 24ee3a chengdu yingji electronic hi-tech co ltd
 24f0ff ght co., ltd.
@@ -13466,9 +13542,12 @@
 281471 lantis co., ltd.
 28162e 2wire
 2817ce omnisense ltd
+281878 microsoft corporation
 2818fd aditya infotech ltd.
 2826a6 pbr electronics gmbh
 2829d9 globalbeiming technology (beijing)co. ltd
+282cb2 tp-link technologies co.,ltd.
+283152 huawei technologies co.,ltd
 283410 enigma diagnostics limited
 283737 apple, inc.
 2838cf gen2wave
@@ -13490,10 +13569,10 @@
 2872f0 athena
 28852d touch networks
 288915 cashguard sverige ab
-2891d0 stage tec entwicklungsgesellschaft fuer professionelle audiotechnik mbh
+2891d0 stage tec entwicklungsgesellschaft für professionelle audiotechnik mbh
 28924a hewlett packard
-2893fe cisco systems
-28940f cisco systems
+2893fe cisco systems, inc.
+28940f cisco systems, inc.
 28987b samsung electronics co.,ltd
 289a4b steelseries aps
 289edf danfoss turbocor compressors, inc
@@ -13502,16 +13581,22 @@
 28a574 miller electric mfg. co.
 28af0a sirius xm radio inc
 28b0cc xenya d.o.o.
+28b2bd intel corporate
 28b3ab genmark automation
 28ba18 nextnav, llc
 28be9b technicolor usa inc.
 28c0da juniper networks
+28c68e netgear inc.,
 28c718 altierre
 28c914 taimag corporation
+28cbeb one
+28cc01 samsung electronics co.,ltd
 28ccff corporacion empresarial altra sl
 28cd1c espotel oy
 28cd4c individual computers gmbh
+28cd9c shenzhen dynamax software development co.,ltd.
 28cfda apple, inc.
+28cfe9 apple
 28d1af nokia corporation
 28d244 lcfc(hefei) electronics technology co., ltd.
 28d576 premier wireless, inc.
@@ -13535,29 +13620,35 @@
 2c1984 idn telecom, inc.
 2c1eea aerodev
 2c2172 juniper networks
+2c245f babolat vs
+2c26c5 zte corporation
 2c27d7 hewlett-packard company
+2c282d bbk communicatiao technology co.,ltd.
 2c2d48 bct electronic gesmbh
 2c3068 pantech co.,ltd
-2c3427 erco & gener
+2c3427 erco & gener
 2c3557 elliy power co..ltd
 2c36a0 capisco limited
-2c36f8 cisco systems
-2c3a28 fagor electrónica
+2c36f8 cisco systems, inc.
+2c3996 sagemcom
+2c3a28 fagor electrónica
 2c3bfd netstor technology co., ltd.
-2c3f38 cisco systems
+2c3f38 cisco systems, inc.
 2c3f3e alge-timing gmbh
 2c4138 hewlett-packard company
 2c4401 samsung electronics co.,ltd
 2c441b spectrum medical limited
-2c542d cisco systems
+2c542d cisco systems, inc.
+2c59e5 hewlett packard
 2c5aa3 promate electronic co.ltd
 2c625a finest security systems co., ltd
 2c6289 regenersis (glenrothes) ltd
 2c67fb shenzhen zhengjili electronics co., ltd
+2c69ba rf controls, llc
 2c6bf5 juniper networks
 2c750f shanghai dongzhou-lawton communication technology co. ltd.
 2c768a hewlett-packard company
-2c7afe iee&e "black" ops
+2c7b5a milper ltd
 2c7ecf onzo ltd
 2c8065 harting inc. of north america
 2c8158 hon hai precision ind. co.,ltd
@@ -13572,11 +13663,14 @@
 2cab25 shenzhen gongjin electronics co.,ltd
 2cb05d netgear
 2cb0df soliton technologies pvt ltd
+2cb43a apple
+2cb693 radware
 2cb69d red digital cinema
 2cbe97 ingenieurbuero bickele und buehler gmbh
 2cc260 ravello systems
 2ccd27 precor inc
 2ccd43 summit technology group
+2cd05a liteon technology corporation
 2cd1da sanjole, inc.
 2cd2e7 nokia corporation
 2cd444 fujitsu limited
@@ -13586,11 +13680,14 @@
 2ce871 alert metalguard aps
 2cedeb alpheus digital company limited
 2cee26 petroleum geo-services
-2cf4c5 avaya inc
+2cf203 emko elektronik san ve tic as
+2cf4c5 avaya, inc
+30055c brother industries, ltd.
 300b9c delta mobile systems, inc.
 300ed5 hon hai precision ind.co.ltd
 30142d piciorgros gmbh
 30144a wistron neweb corp.
+301518 ubiquitous communication co. ltd.
 30168d prolon
 3017c8 sony ericsson mobile communications ab
 3018cf deos control systems gmbh
@@ -13599,7 +13696,7 @@
 302de8 jda, llc (jda systems)
 303294 w-ie-ne-r plein & baus gmbh
 3032d4 hanilstm co., ltd.
-3037a6 cisco systems
+3037a6 cisco systems, inc.
 303855 nokia corporation
 303926 sony ericsson mobile communications ab
 303955 shenzhen jinhengjia electronic co., ltd.
@@ -13626,16 +13723,22 @@
 307ecb sfr
 3085a9 asustek computer inc
 308730 huawei device co., ltd
+308999 guangdong east power co.,
 308cfb dropcam
+3090ab apple
 3092f6 shanghai sunmon communication technogy co.,ltd
+30aabd shanghai reallytek information technology co.,ltd
+30ae7b deqing dusun electron co., ltd
 30aef6 radio mobile access
 30b216 hytec geraetebau gmbh
 30b3a2 shenzhen heguang measurement & control technology co.,ltd
 30c82a wi-next s.r.l.
+30cda7 samsung electronics its, printer division
 30d357 logosol, inc.
+30d46a autosales incorporated
 30de86 cedac software s.r.l.
 30e48e vodafone uk
-30e4db cisco systems
+30e4db cisco systems, inc.
 30eb25 intek digital
 30efd1 alstom strongwish (shenzhen) co., ltd.
 30f33a +plugg srl
@@ -13660,6 +13763,7 @@
 346bd3 huawei technologies co., ltd
 346e8a ecosense
 346f92 white rodgers division
+3475c7 avaya, inc
 3476c5 i-o data device, inc.
 347877 o-net communications(shenzhen) limited
 347e39 nokia danmark a/s
@@ -13679,7 +13783,9 @@
 34a84e cisco
 34aa99 alcatel-lucent
 34aaee mikrovisatos servisas uab
+34ade4 shanghai chint power systems co., ltd.
 34af2c nintendo co., ltd.
+34b1f7 texas instruments
 34b571 plds
 34ba51 se-kure controls, inc.
 34ba9a asiatelco technologies co.
@@ -13694,6 +13800,7 @@
 34c731 alps electric co,. ltd.
 34c803 nokia corporation
 34c99d eidolon communications technology co. ltd.
+34cdbe huawei technologies co., ltd
 34ce94 parsec (pty) ltd
 34d09b mobilmax technology inc.
 34d2c4 rena gmbh print systeme
@@ -13704,6 +13811,7 @@
 34ef44 2wire
 34ef8b ntt communications corporation
 34f39b wizlan ltd.
+34f62d sharp corporation
 34f968 atek products, llc
 34fa40 guangzhou robustel technologies co., limited
 34fc6f alcea
@@ -13711,7 +13819,9 @@
 380a0a sky-city communication and electronics limited company
 380a94 samsung electronics co.,ltd
 380dd4 primax electronics ltd.
+380fe4 dedicated network partners oy
 3816d1 samsung electronics co.,ltd
+381766 promzakaz ltd.
 38192f nokia corporation
 381c4a simcom wireless solutions co.,ltd.
 38229d adb broadband italia
@@ -13720,8 +13830,11 @@
 3828ea fujian netcom technology co., ltd
 3831ac weg
 383f10 dbl technology ltd.
+384369 patrol products consortium llc
 38458c mycloud technology corporation
 384608 zte corporation
+38484c apple
+384ff0 azurewave technologies, inc.
 38521a alcatel-lucent 7705
 38580c panaccess systems gmbh
 3859f9 hon hai precision ind. co.,ltd.
@@ -13729,28 +13842,33 @@
 386077 pegatron corporation
 3863f6 3nod multimedia(shenzhen)co.,ltd
 386645 oosic technology co.,ltd
+386793 asia optical co., inc.
 386bbb motorola mobility, inc.
 386e21 wasion group ltd.
 3872c0 comtrend
 388345 tp-link technologies co., ltd.
-388ab7 panasonic telecom co.,ltd
+388ab7 itc networks
 388ee7 fanhattan llc
 3891fb xenox holding bv
 389592 beijing tendyron corporation
 389f83 otn systems n.v.
 38a5b6 shenzhen megmeet electrical co.,ltd
 38a851 quickset international inc
+38a86b orga bv
 38a95f actifio inc
 38aa3c samsung electro-mechanics
 38b12d sonotronic nagel gmbh
+38b5bd e.g.o. elektro-ger
 38bb23 ozvision america llc
 38bc1a meizu technology co.,ltd
 38bf33 nec casio mobile communications
+38c096 alps electric co.,ltd.
 38c7ba cs services co.,ltd.
 38c85c cisco spvtg
 38d135 easyio corporation sdn. bhd.
 38de60 mohlenhoff gmbh
-38e08e mitsubishi electric co.
+38e08e mitsubishi electric corporation
+38e595 shenzhen gongjin electronics co.,ltd
 38e7d8 htc corporation
 38e8df b gmbh medien + datenbanken
 38e98c reco s.p.a.
@@ -13765,6 +13883,7 @@
 3c05ab product creation studio
 3c0754 apple, inc.
 3c0771 sony corporation
+3c081e beijing yupont electric power technology co.,ltd
 3c096d powerhouse dynamics
 3c0fc1 kbc networks
 3c106f albahith technologies
@@ -13773,7 +13892,7 @@
 3c1a79 huayuan technology co.,ltd
 3c1cbe jadak llc
 3c26d5 sotera wireless
-3c2763 sle quality engineering gmbh & co. kg
+3c2763 sle quality engineering gmbh & co. kg
 3c2db7 texas instruments
 3c2f3a sforzato corp.
 3c363d nokia corporation
@@ -13793,16 +13912,19 @@
 3c672c sciovid inc.
 3c6a7d niigata power systems co., ltd.
 3c6f45 fiberpro inc.
+3c6ff7 entek systems, inc.
 3c7059 makerbot industries
 3c7437 rim
 3c754a motorola mobility, inc.
 3c7db1 texas instruments
 3c81d8 sagemcom sas
 3c83b5 advance vision electronics co. ltd.
+3c86a8 sangshin elecom .co,, ltd
 3c8ae5 tensun information technology(hangzhou) co.,ltd
 3c8bfe samsung electronics
 3c9157 hangzhou yulong conmunication co.,ltd
 3c9174 along communication technology
+3c94d5 juniper networks
 3c970e wistron infocomm(kunshan)co.,ltd.
 3c98bf quest controls, inc.
 3c99f7 lansentechnology ab
@@ -13815,16 +13937,18 @@
 3cb87a 
 3cb9a6 belden deutschland gmbh
 3cbdd8 lg electronics inc
-3cc0c6 d&b audiotechnik gmbh
+3cc0c6 d&b audiotechnik gmbh
 3cc12c aes corporation
 3cc1f6 melange systems pvt. ltd.
+3cc243 nokia corporation
 3cc99e huiyang technology co., ltd
-3cce73 cisco systems
+3cce73 cisco systems, inc.
 3cd0f8 apple, inc.
 3cd16e telepower communication co., ltd
 3cd7da sk mtek microelectronics(shenzhen)limited
 3cd92b hewlett-packard company
-3cdf1e cisco systems
+3cdf1e cisco systems, inc.
+3ce072 apple
 3ce5a6 hangzhou h3c technologies co., ltd.
 3ce5b4 kidasen industria e comercio de antenas ltda
 3ce624 lg display
@@ -13833,6 +13957,7 @@
 3cf392 virtualtek. co. ltd
 3cf52c dspecialists gmbh
 3cf72a nokia corporation
+3cfb96 emcraft systems llc
 4001c6 3com europe ltd
 40040c a&t
 400e67 tremol ltd.
@@ -13858,8 +13983,9 @@
 404a03 zyxel communications corporation
 404d8e huawei device co., ltd
 4050e0 milton security group llc
+40516c grandex international corporation
 40520d pico technology
-405539 cisco systems
+405539 cisco systems, inc.
 405a9b anovo
 405fbe rim
 405fc2 texas instruments
@@ -13884,10 +14010,11 @@
 40984c casacom solutions ag
 40984e texas instruments
 40987b aisino corporation
-409fc7 baekchun enc co., ltd.
+409fc7 baekchun i&c co., ltd.
 40a6a4 passivsystems ltd
 40a6d9 apple, inc.
 40ac8d data management, inc.
+40b0fa lg electronics
 40b2c8 nortel networks
 40b395 apple
 40b3fc logital co. limited
@@ -13897,35 +14024,43 @@
 40bc8b itelio gmbh
 40bf17 digistar telecom. sa
 40c245 shenzhen hexicom technology co., ltd.
+40c4d6 chongqing camyu technology development co.,ltd.
 40c7c9 naviit inc.
+40cba8 huawei technologies co., ltd
 40cd3a z3 technology
 40d32d apple, inc
 40d40e biodata ltd
 40d559 micro s.e.r.i.
 40d855 ieee registration authority
+40e730 dey storage systems, inc.
 40e793 shenzhen siviton technology co.,ltd
 40ecf8 siemens ag
 40ef4c fihonest communication co.,ltd
 40f14c ise europe sprl
 40f2e9 ibm
 40f407 nintendo co., ltd.
-40f4ec cisco systems
+40f4ec cisco systems, inc.
 40f52e leica microsystems (schweiz) ag
 40fc89 motorola mobility, inc.
 4403a7 cisco
 440cfd netman co., ltd.
 441319 wkk technology ltd.
+44184f fitview
+4419b6 hangzhou hikvision digital technology co.,ltd.
 441ea1 hewlett-packard company
 4423aa farmage co., ltd.
 4425bb bamboo entertainment corporation
 442a60 apple, inc.
-442b03 cisco systems
-44322a avaya inc
+442b03 cisco systems, inc.
+44322a avaya, inc
+4432c8 technicolor usa inc.
+44334c shenzhen bilian electronic co.,ltd
 44348f mxt industrial ltda
 443719 2 save energy ltd
 44376f young electric sign co
 4437e6 hon hai precision ind.co.ltd
 443839 cumulus networks, inc
+4439c4 universal global scientific industrial co.,ltd
 443d21 nuvolt
 443eb2 deotron co., ltd.
 444c0c apple inc
@@ -13940,6 +14075,7 @@
 445ef3 tonalite holding b.v.
 445f7a shihlin electric & engineering corp.
 446132 ecobee inc
+44619c fonsystem co. ltd.
 4468ab juin company, limited
 446c24 reallin electronic co.,ltd
 446d57 liteon technology corporation
@@ -13953,7 +14089,9 @@
 448e12 dt research, inc.
 448e81 vig
 4491db shanghai huaqin telecom technology co.,ltd
+4494fc netgear inc.,
 4495fa qingdao santong digital technology co.ltd
+449b78 the now factory
 449cb5 alcomp, inc
 44a42d tct mobile limited
 44a689 promax electronica sa
@@ -13961,6 +14099,7 @@
 44a8c2 sewoo tech co., ltd
 44aa27 udworks co., ltd.
 44aae8 nanotec electronic gmbh & co. kg
+44add9 cisco
 44b382 kuang-chi institute of advanced technology
 44c15c texas instruments
 44c233 guangzhou comet technology development co.ltd
@@ -13968,7 +14107,7 @@
 44c9a2 greenwald industries
 44d15e shanghai kingto information technology ltd
 44d2ca anvia tv oy
-44d3ca cisco systems
+44d3ca cisco systems, inc.
 44d63d talari networks
 44d832 azurewave technologies, inc.
 44d884 apple, inc.
@@ -13976,10 +14115,11 @@
 44dccb semindia systems pvt ltd
 44e08e cisco spvtg
 44e49a omnitronics pty ltd
-44e4d9 cisco systems
+44e4d9 cisco systems, inc.
 44e8a5 myreka technologies sdn. bhd.
 44ed57 longicorn, inc.
 44f459 samsung electronics
+44f849 union pacific railroad
 44fb42 apple
 48022a b-link electronic limited
 480362 desay electronics(huizhou)co.,ltd
@@ -14004,7 +14144,7 @@
 486fd2 storsimple inc
 487119 sgb group ltd.
 488e42 digalog gmbh
-489153 weinmann geräte für medizin gmbh + co. kg
+489153 weinmann geräte für medizin gmbh + co. kg
 4891f6 shenzhen reach software technology co.,ltd
 489be2 sci innovations ltd
 48a22d shenzhen huaxuchang telecom technology co.,ltd
@@ -14013,6 +14153,7 @@
 48b253 marketaxess corporation
 48b8de homewins technology co.,ltd.
 48b9c2 teletics inc.
+48be2d symanitron
 48c1ac plantronics, inc.
 48c862 simo wireless,inc.
 48c8b6 systec gmbh
@@ -14026,11 +14167,13 @@
 48ea63 zhejiang uniview technologies co., ltd.
 48eb30 eterna technology, inc.
 48ed80 daesung eltec
+48f230 ubizcore co.,ltd
 48f317 
 48f47d techvision holding  internation limited
 48f7f1 alcatel-lucent
 48f8b3 cisco-linksys, llc
 48f8e1 alcatel lucent wt
+48f925 maestronic
 48fcb8 woodstream corporation
 4c022e cmr korea co., ltd
 4c0289 lex computech co., ltd
@@ -14043,8 +14186,10 @@
 4c1480 noregon systems, inc
 4c17eb sagemcom
 4c1a3a prima research and production enterprise ltd.
+4c1a95 novakon co., ltd.
 4c1fcc huawei technologies co.,ltd
 4c2258 cozybit, inc.
+4c2578 nokia corporation
 4c2c80 beijing skyway technologies co.,ltd
 4c2f9d icm controls
 4c3089 thales transportation systems gmbh
@@ -14053,6 +14198,7 @@
 4c3910 newtek electronics co., ltd.
 4c3b74 vogtec(h.k.) co., ltd
 4c4b68 mobile device, inc.
+4c4e35 cisco
 4c5427 linepro sp. z o.o.
 4c5499 huawei device co., ltd
 4c5585 hamilton systems
@@ -14060,6 +14206,7 @@
 4c5fd2 alcatel-lucent
 4c60d5 airpointe of new hampshire
 4c60de netgear
+4c6255 sanmina-sci system de mexico s.a. de c.v.
 4c63eb application solutions (electronics and vision) ltd
 4c64d9 guangdong leawin group co., ltd
 4c72b9 pegatron corporation
@@ -14067,9 +14214,14 @@
 4c73a5 kove
 4c774f embedded wireless labs
 4c7897 arrowhead alarm products ltd
+4c79ba intel corporate
+4c804f armstrong monitoring corp
 4c8093 intel corporate
+4c82cf echostar technologies
 4c8b55 grupo digicon
 4c8bef huawei technologies co., ltd
+4c8d79 apple
+4c8fa5 jastec
 4c98ef zeo
 4c9e80 kyokko electric co., ltd.
 4c9ee4 hanyang navicom co.,ltd.
@@ -14086,6 +14238,8 @@
 4cc452 shang hai tyd. electon technology ltd.
 4cc602 radios, inc.
 4cc94f alcatel-lucent
+4cca53 skyera, inc.
+4ccc34 motorola solutions inc.
 4ce676 buffalo inc.
 4ceb42 intel corporate
 4cedde askey computer corp
@@ -14093,6 +14247,7 @@
 50008c hong kong telecommunications (hkt) limited
 5001bb samsung electronics
 50053d cywee group ltd
+500604 cisco
 500b32 foxda technology industrial(shenzhen)co.,ltd
 500e6d trafficcast international
 5011eb silvernet ltd
@@ -14105,15 +14260,19 @@
 502da2 intel corporate
 502df4 phytec messtechnik gmbh
 502ece asahi electronics co.,ltd
+503275 samsung electronics co.,ltd
 503955 cisco spvtg
-503de5 cisco systems
+503de5 cisco systems, inc.
 503f56 syncmold enterprise corp
 50465d asustek computer inc.
 5048eb beijing haihejinsheng network technology co. ltd.
 504a5e masimo corporation
+504f94 loxone electronics gmbh
 505663 texas instruments
-5057a8 cisco systems
+5057a8 cisco systems, inc.
+505ac6 guangdong super telecom co.,ltd.
 506028 xirrus inc.
+5061d6 indu-sol gmbh
 506313 hon hai precision ind. co.,ltd.
 506441 greenlee
 5067f0 zyxel communications corporation
@@ -14128,23 +14287,30 @@
 508a42 uptmate technology co., ltd
 508acb shenzhen maxmade technology co., ltd.
 508c77 dirmeier schanktechnik gmbh &co kg
+508d6f chahoo limited
 50934f gradual tecnologia ltda.
 509772 westinghouse digital
+509f27 huawei technologies co., ltd
+50a4c8 samsung electronics co.,ltd
 50a6e3 david clark company
+50a715 aboundi, inc.
 50a733 ruckus wireless
+50abbf hoseo telecom
 50af73 shenzhen bitland information technology co., ltd.
 50b7c3 samsung electronics co.,ltd
 50c58d juniper networks
 50c971 gn netcom a/s
 50ccf8 samsung electro mechanics
+50cd32 nanjing chaoran science & technology co.,ltd.
 50ce75 measy electronics ltd
 50d274 steffes corporation
 50d6d7 takahata precision
 50e549 giga-byte technology co.,ltd.
 50ead6 apple, inc.
-50eb1a brocade communications systems, inc
+50eb1a brocade communications systems, inc.
 50ed94 egatel sl
 50f003 open stack, inc.
+50f520 samsung electronics co.,ltd
 50f61a kunshan jade technologies co., ltd.
 50faab l-tek d.o.o.
 50fc30 treehouse labs
@@ -14154,25 +14320,30 @@
 54055f alcatel lucent
 54115f atamo pty ltd
 541dfb freestyle energy ltd
+541fd5 advantage electronics
 542018 tely labs
 542696 apple
 542a9c lsy defense, llc.
 543131 raster vision ltd
 5435df symeo gmbh
 543968 edgewater networks inc
+543d37 ruckus wireless
 544249 sony corporation
 54466b shenzhen cztic electronic technology co., ltd
 544a05 wenglor sensoric gmbh
 5453ed sony corporation
+545414 digital rf corea, inc
 545ebd nl technologies
 545fa9 teracom limited
+5461ea zaplox ab
 547398 toyo electronics corporation
 5474e6 webtech wireless
-5475d0 cisco systems
+5475d0 cisco systems, inc.
 54781a cisco
+547975 nokia corporation
 547f54 ingenico
 547fa8 telco systems, s.r.o.
-547fee cisco systems
+547fee cisco systems, inc.
 5481ad eagle research corporation
 54847b digital devices gmbh
 548922 zelfy inc
@@ -14191,14 +14362,16 @@
 54d1b0 universal laser systems, inc
 54d46f cisco spvtg
 54df63 intrakey technologies gmbh
+54e032 juniper networks
 54e63f shenzhen lingkeweier technology co., ltd.
 54e6fc tp-link technologies co., ltd.
 54f5b6 oriental pacific international limited
 54f666 berthold technologies gmbh and co.kg
 54fdbf scheidt & bachmann gmbh
 580556 elettronica gf s.r.l.
-5808fa fiber optic & telecommunication inc.
+5808fa fiber optic & telecommunication inc.
 580943 
+5809e5 kivic inc.
 581243 acsip technology corp.
 581626 avaya, inc
 58170c sony ericsson mobile communications ab
@@ -14208,7 +14381,7 @@
 582efe lighting science group
 582f42 universal electric corporation
 58343b glovast technology ltd.
-5835d9 cisco systems
+5835d9 cisco systems, inc.
 583cc6 omneality ltd.
 5842e4 sigma international general medical apparatus, llc.
 5846e1 baxter healthcare
@@ -14234,7 +14407,7 @@
 5884e4 ip500 alliance e.v.
 58874c lite-on clean energy technology corp.
 5887e2 shenzhen coship electronics co., ltd.
-588d09 cisco systems
+588d09 cisco systems, inc.
 5891cf intel corporate
 58920d kinetic avionics limited
 589396 ruckus wireless
@@ -14247,9 +14420,9 @@
 58b035 apple, inc
 58b0d4 zunidata systems inc.
 58b9e1 crystalfontz america, inc.
-58bc27 cisco systems
+58bc27 cisco systems, inc.
 58bda3 nintendo co., ltd.
-58bfea cisco systems
+58bfea cisco systems, inc.
 58c232 nec corporation
 58c38b samsung electronics
 58cf4b lufkin industries
@@ -14261,6 +14434,7 @@
 58e636 evrsafe technologies
 58e747 deltanet ag
 58e808 autonics corporation
+58eb14 proteus digital health
 58ece1 newport corporation
 58eece icon time systems
 58f67b xia men unioncore technology ltd.
@@ -14276,6 +14450,8 @@
 5c1737 i-view now, llc.
 5c17d3 lge
 5c18b5 talon communications
+5c20d0 asoni communication co., ltd.
+5c22c4 dae eun eletronics co., ltd
 5c2479 baltech ag
 5c260a dell inc.
 5c338e alpha networkc inc.
@@ -14283,9 +14459,10 @@
 5c35da there corporation oy
 5c38e0 shanghai super electronics technology co.,ltd
 5c4058 jefferson audio video systems, inc.
+5c43d2 hazemeyer
 5c4a26 enguity technology corp
 5c4ca9 huawei device co., ltd
-5c5015 cisco systems
+5c5015 cisco systems, inc.
 5c514f intel corporate
 5c56ed 3pleplay electronics private limited
 5c571a arris group, inc.
@@ -14300,6 +14477,7 @@
 5c6f4f s.a. sistel
 5c7757 haivision network video
 5c7d5e huawei technologies co., ltd
+5c8486 brightsource industries israel ltd
 5c864a secret labs llc
 5c8778 cybertelbridge co.,ltd
 5c89d4 beijing banner electric co.,ltd
@@ -14316,10 +14494,12 @@
 5cca32 theben ag
 5ccead cdyne corporation
 5cd135 xtreme power systems
+5cd2e4 intel corporate
 5cd41b uczoon technology co., ltd
 5cd4ab zektor
 5cd998 d-link corporation
 5cdad4 murata manufacturing co., ltd.
+5ce0ca feitian united (beijing) system technology co., ltd.
 5ce0f6 nic.br- nucleo de informacao e coordenacao do ponto br
 5ce223 delphin technology ag
 5ce286 nortel networks
@@ -14328,17 +14508,21 @@
 5ceb4e r. stahl hmi systems gmbh
 5cee79 global digitech co ltd
 5cf207 speco technologies
+5cf370 cc&c technologies, inc
 5cf3fc ibm corp
+5cf6dc samsung electronics co.,ltd
+5cf8a1 murata manufactuaring co.,ltd.
 5cf9dd dell inc
 5cff35 wistron corporation
 6002b4 wistron neweb corp.
 600f77 silverplus, inc
-601199 data-tester inc.
+601199 siama systems inc
 601283 soluciones tecnologicas para la salud y el bienestar sa
 6015c7 idatech
 60190c rramac
 601929 voltronic power technology(shenzhen) corp.
 601d0f midnite solar
+601e02 eltexalatau
 6021c0 murata manufactuaring co.,ltd.
 602a54 cardiotek b.v.
 602ad0 cisco spvtg
@@ -14355,6 +14539,7 @@
 604616 xiamen vann intelligent co., ltd
 6052d0 facts engineering
 605464 eyedro green solutions inc.
+60601f sz dji technology co.,ltd
 6063fd transcend communication beijing co.,ltd.
 606720 intel corporate
 606bbd samsung electronics co., ltd
@@ -14367,7 +14552,7 @@
 608645 avery weigh-tronix, llc
 60893c thermo fisher scientific p.o.a.
 6089b1 key digital systems
-6089b7 kael mÜhendislik elektronik ticaret sanayi limited Þirketi
+6089b7 kael mÜhendİslİk elektronİk tİcaret sanayİ lİmİted Şİrketİ
 608c2b hanson technology
 608d17 sentrus government systems division, inc
 609084 dssd inc
@@ -14375,10 +14560,13 @@
 609e64 vivonic gmbh
 609f9d cloudswitch
 60a10a samsung electronics co.,ltd
+60a44c asustek computer inc.
+60b185 ath system
 60b3c4 elber srl
 60b606 phorus
 60b933 deutron electronics corp.
 60b982 ro.ve.r. laboratories s.p.a.
+60bb0c beijing huaqinworld technology co,ltd
 60bc4c ewm hightec welding gmbh
 60bd91 move innovation
 60c547 apple, inc.
@@ -14393,6 +14581,7 @@
 60d819 hon hai precision ind. co.,ltd.
 60da23 estech co.,ltd
 60de44 huawei technologies co.,ltd
+60e00e shinsei electronics co ltd
 60e956 ayla networks, inc
 60eb69 quanta computer inc.
 60f13d jablocom s.r.o.
@@ -14404,13 +14593,14 @@
 60f673 terumo corporation
 60facd apple, inc.
 60fb42 apple, inc
-6400f1 cisco systems
+60fec5 apple
+6400f1 cisco systems, inc.
 64094c beijing superbee wireless technology co.,ltd
 640e36 taztag
 640e94 pluribus networks, inc.
 640f28 2wire
 641084 hexium technical development co., ltd.
-64168d cisco systems
+64168d cisco systems, inc.
 6416f0 shehzhen huawei communication technologies co., ltd.
 641a22 heliospectra/woodhill investments
 641c67 digibras industria do brasils/a
@@ -14430,6 +14620,7 @@
 644f74 lenus co., ltd.
 64517e long ben (dongguan) electronic technology co.,ltd.
 645299 chamberlain
+64535d frauscher sensortechnik
 645422 equinox payments
 645563 intelight inc.
 64557f nsfocus information technology co., ltd.
@@ -14445,8 +14636,10 @@
 6469bc hytera communications co .,ltd
 646e6c radio datacom llc
 647002 tp-link technologies co., ltd.
+6472d8 goowi technology co.,limited
 6473e2 arbiter systems, inc.
 647657 innovative security designs
+647791 samsung electronics co.,ltd
 647bd4 texas instruments
 647c34 ubee interactive corp.
 647d81 yokota industrial co,.ltd
@@ -14457,35 +14650,40 @@
 648788 juniper networks
 6487d7 adb broadband italia
 64995d lge
+649968 elentec
+6499a0 ag elektronik ab
 649b24 v technology co., ltd.
 649c8e texas instruments
-649ef3 cisco systems
+649ef3 cisco systems, inc.
 649ff7 kone oyj
-64a0e7 cisco systems
+64a0e7 cisco systems, inc.
 64a232 ooo samlight
 64a341 wonderlan (beijing) technology co., ltd.
 64a3cb apple
 64a769 htc corporation
 64a837 juni korea co., ltd
-64ae0c cisco systems
+64ae0c cisco systems, inc.
 64ae88 polytec gmbh
+64b310 samsung electronics co.,ltd
 64b64a vivotech, inc.
 64b9e8 apple, inc
 64bc11 combiq ab
 64c5aa south african broadcasting corporation
+64c667 barnes&noble
 64c6af axerra networks ltd
 64c944 lark technologies, inc
 64d02d next generation integration (ngi)
 64d1a3 sitecom europe bv
 64d241 keith & koep gmbh
 64d4da intel corporate
-64d814 cisco systems
+64d814 cisco systems, inc.
 64d912 solidica, inc.
-64d989 cisco systems
+64d989 cisco systems, inc.
 64db18 openpattern
 64dc01 static systems group plc
 64de1c kingnetic pte ltd
 64e161 dep corp.
+64e599 efm networks
 64e682 apple, inc.
 64e84f serialway communication technology co. ltd
 64e8e6 global moisture management system
@@ -14504,15 +14702,19 @@
 681729 intel corporate
 681ab2 zte corporation
 681ca2 rosewill inc.
+681e8b infosight corporation
 681fd8 advanced telemetry
 68234b nihon dengyo kousaku
 683b1e countwise ltd
+683eec ereca
 684352 bhuu limited
 684b88 galtronics telemetry inc.
 684ca8 shenzhen herotel tech. co., ltd.
 6851b7 powercloud systems, inc.
+6854ed alcatel-lucent - nuage
 6854f5 enlighted inc
 68597f alcatel lucent
+685b35 apple inc
 685b36 powertech industrial co., ltd.
 685d43 intel corporate
 685e6b powerray co., ltd.
@@ -14523,40 +14725,49 @@
 68784c nortel networks
 687924 els-gmbh & co. kg
 6879ed sharp corporation
+687cd5 y soft corporation, a.s.
 687f74 cisco-linksys, llc
+68831a pandora mobility corporation
 688470 essys co.,ltd
 688540 igi mobile, inc.
+6886a7 cisco
+6886e7 orbotix, inc.
 68876b inq mobile limited
 689234 ruckus wireless
 689423 hon hai precision ind. co.,ltd.
 68967b apple inc
 68974b shenzhen costar electronics co. ltd.
+6897e8 society of motion picture & television engineers
 689c5e acsip technology corp.
 68a1b7 honghao mingchuan technology (beijing) co.,ltd.
 68a3c4 liteon technology corporation
+68a40e bsh bosch and siemens home appliances gmbh
 68a86d apple, inc.
 68aad2 datecs ltd.,
 68ab8a rf ideas
 68af13 futura mobility
+68b094 inesa electron co.,ltd
 68b43a waterfurnace international, inc.
 68b599 hewlett-packard company
 68b6fc hitron technologies. inc
 68b8d9 act kde, inc.
-68bc0c cisco systems
-68bdab cisco systems
+68bc0c cisco systems, inc.
+68bdab cisco systems, inc.
 68ca00 octopus systems limited
 68cc9c mine site technologies
 68cd0f u tek company limited
 68ce4e l-3 communications infrared products
 68d1fd shenzhen trimax technology co.,ltd
 68d925 prosys development services
+68db67 nantong coship electronics co., ltd
 68db96 opwill technologies co .,ltd
 68dce8 packetstorm communications
 68e41f unglaube identech gmbh
 68ebae samsung electronics co.,ltd
 68ebc5 angstrem telecom
+68ec62 yodo technology corp. ltd.
 68ed43 research in motion
-68efbd cisco systems
+68efbd cisco systems, inc.
 68f125 data controls inc.
 68f895 redflow limited
 68fb95 generalplus technology inc.
@@ -14567,6 +14778,7 @@
 6c2056 cisco
 6c22ab ainsworth game technology
 6c23b9 sony ericsson mobile communications ab
+6c2995 intel corporate
 6c2e33 accelink technologies co.,ltd.
 6c2e85 sagemcom
 6c32de indieon technologies pvt. ltd.
@@ -14577,25 +14789,28 @@
 6c3e6d apple inc
 6c3e9c ke knestel elektronik gmbh
 6c40c6 nimbus data systems, inc.
-6c504d cisco systems
+6c504d cisco systems, inc.
 6c5a34 shenzhen haitianxiong electronic co., ltd.
 6c5cde sunreports, inc.
 6c5d63 shenzhen rapoo technology co., ltd.
 6c5e7a ubiquitous internet telecom co., ltd
+6c6126 rinicom holdings
 6c626d micro-star int'l co., ltd
 6c6f18 stereotaxis, inc.
 6c7039 novar gmbh
 6c71d9 azurewave technologies, inc
 6c81fe mitsuba corporation
 6c8336 samsung electronics co.,ltd
+6c8686 technonia
 6c8814 intel corporate
+6c8b2f zte corporation
 6c8cdb otus technologies ltd
 6c8d65 wireless glue networks, inc.
 6c92bf inspur electronic information industry co.,ltd.
 6c9ac9 valentine research, inc.
 6c9b02 nokia corporation
 6c9ce9 nimble storage
-6c9ced cisco systems
+6c9ced cisco systems, inc.
 6ca682 edam information & communications
 6ca780 nokia corporation
 6ca906 telefield ltd
@@ -14610,6 +14825,7 @@
 6cc1d2 motorola mobility, inc.
 6cc26b apple, inc.
 6cd032 lg electronics
+6cd146 smartek d.o.o.
 6cd68a lg electronics inc
 6cdc6a promethean limited
 6ce0b0 sound4
@@ -14618,17 +14834,22 @@
 6ce907 nokia corporation
 6ce983 gastron co., ltd.
 6cf049 giga-byte technology co.,ltd.
+6cf373 samsung electronics co.,ltd
 6cf37f aruba networks
+6cfa58 avaya, inc
 6cfdb9 proware technologies co ltd.
 6cffbe mpb communications inc.
 700258 01db-metravib
 700514 lg electronics
 700bc0 dewav technology company
+70105c cisco
+701124 apple
 701404 limited liability company "research center "bresler"
 701a04 liteon tech corp.
 701aed advas co., ltd.
 702393 fos4x gmbh
 702526 alcatel-lucent
+702559 cybertan technology, inc.
 702b1d e-domus international limited
 702f4b polyvision inc.
 702f97 aava mobile oy
@@ -14636,14 +14857,17 @@
 703187 acx gmbh
 7032d5 athena wireless communications inc
 703811 invensys rail
-7038ee avaya inc
+7038b4 low tech solutions
+7038ee avaya, inc
 703ad8 shenzhen afoundry electronic co., ltd
 703c39 seawing kft
 7041b7 edwards lifesciences llc
 704642 chyng hong electronic co., ltd.
 704aae xstream flow (pty) ltd
 704ae4 rinstrum pty ltd
+7052c5 avaya, inc.
 7054d2 pegatron corporation
+7054f5 huawei technologies co.,ltd
 705681 apple inc
 705812 panasonic avc networks company
 705ab6 compal information (kunshan) co., ltd.
@@ -14662,7 +14886,8 @@
 707be8 huawei technologies co.,ltd
 707e43 motorola mobility, inc.
 707ede nastec ltd.
-708105 cisco systems
+708105 cisco systems, inc.
+70820e as electronics gmbh
 70828e oleumtech corporation
 708b78 citygrow technology co., ltd
 7093f8 space monkey, inc.
@@ -14679,7 +14904,7 @@
 70b265 hiltron s.r.l.
 70b599 embedded technologies s.r.o.
 70b921 fiberhome telecommunication technologies co.,ltd
-70ca9b cisco systems
+70ca9b cisco systems, inc.
 70cd60 apple, inc.
 70d4f2 rim
 70d57e scalar corporation
@@ -14700,6 +14925,7 @@
 741489 srt wireless
 7415e2 tri-sen systems corporation
 741e93 fiberhome telecommunication tech.co.,ltd.
+74258a hangzhou h3c technologies co., limited
 74273c changyang technology (nanjing) co., ltd
 7427ea elitegroup computer systems co., ltd.
 742b0f infinidat ltd.
@@ -14711,11 +14937,13 @@
 743889 annax anzeigesysteme gmbh
 744401 netgear
 74458a samsung electronics co.,ltd
+7446a0 hewlett packard
 744d79 arrive systems inc.
 745327 commsen co., limited
 745612 motorola mobility, inc.
 745798 trumpf laser gmbh + co. kg
 745e1c pioneer corporation
+745f00 samsung semiconductor inc.
 745fae tsl ppl
 7463df vts gmbh
 7465d1 atlinks
@@ -14727,6 +14955,7 @@
 747db6 aliwei communications, inc
 747e1a red embedded design limited
 747e2d beijing thomson citic digital technology co. ltd.
+74867a dell inc pcba test
 74888b adb broadband italia
 748ef8 brocade communications systems, inc.
 749050 renesas electronics corporation
@@ -14744,6 +14973,7 @@
 74bfa1 hyunteck
 74cd0c smith myers communications ltd.
 74ce56 packet force technology limited company
+74d02b asustek computer inc.
 74d0dc ericsson ab
 74d675 wyma tecnologia
 74d850 evrisko systems
@@ -14757,8 +14987,10 @@
 74e543 liteon technology corporation
 74e7c6 motorola mobility, inc.
 74ea3a tp-link technologies co.,ltd.
+74ecf1 acumen
 74f06d azurewave technologies, inc.
 74f07d bncom co.,ltd
+74f102 beijing hchcom technology co., ltd
 74f612 motorola mobility, inc.
 74f726 neuron robotics
 74fda0 compupal (group) corporation
@@ -14774,12 +15006,14 @@
 781c5a sharp corporation
 781dba huawei technologies co.,ltd
 781dfd jabil inc
+781fdb samsung electronics co.,ltd
 78223d affirmed networks
 782544 omnima limited
 7825ad samsung electronics co., ltd.
 782bcb dell inc
 782eef nokia corporation
 7830e1 ultraclenz, llc
+78324f millennium group, inc.
 783ce3 kai-ee
 783f15 easysync ltd.
 784405 fujitu(hong kong) electronic co.,ltd.
@@ -14788,13 +15022,17 @@
 7846c4 daehap hyper-tech
 78471d samsung electronics co.,ltd
 78510c liveu ltd.
+78521a samsung electronics co.,ltd
 785262 shenzhen hojy software co., ltd.
+78542e d-link international
+785517 sankyuelectronics
 785712 mobile integration workgroup
 78593e rafi gmbh & co.kg
 78595e samsung electronics co.,ltd
 785c72 hioso technology co., ltd.
 78617c mitsumi electric co.,ltd
 7866ae ztec instruments, inc.
+786c1c apple
 787f62 gik mbh
 78818f server racks australia pty ltd
 78843c sony corporation
@@ -14804,10 +15042,12 @@
 78929c intel corporate
 7898fd q9 networks inc.
 78995c nationz technologies inc
+789966 musilab electronics (dongguan)co.,ltd.
 78998f mediline italia srl
 789ed0 samsung electronics
 789f87 siemens ag i ia pp prm
 78a051 iinet labs pty ltd
+78a106 tp-link technologies co.,ltd.
 78a183 advidia
 78a2a0 nintendo co., ltd.
 78a3e4 apple, inc.
@@ -14842,18 +15082,21 @@
 78ec22 shanghai qihui telecom technology co., ltd
 78ef4c unetconvergence co., ltd.
 78f5fd huawei technologies co., ltd
+78f7be samsung electronics co.,ltd
 78f7d0 silverbrook research
 78fe3d juniper networks
+78ff57 intel corporate
 7c0187 curtis instruments, inc.
 7c02bc hansung electronics co. ltd
 7c034c sagemcom
 7c03d8 sagemcom sas
+7c0507 pegatron corporation
 7c051e rafael ltd.
 7c08d9 shanghai engineering research center for broadband technologies and applications
 7c092b bekey a/s
 7c0a50 j-mex inc.
 7c11be apple, inc.
-7c1476 damall technologies s.a.s. di ludovic anselme glaglanon & c.
+7c1476 damall technologies sas
 7c160d saia-burgess controls ag
 7c1e52 microsoft
 7c1eb3 2n telekomunikace a.s.
@@ -14866,6 +15109,7 @@
 7c3920 ssoma security
 7c3bd5 imago group
 7c3e9d patech
+7c438f e-band communications corp.
 7c4a82 portsmith llc
 7c4aa8 mindtree wireless pvt ltd
 7c4b78 red sun synthesis pte ltd
@@ -14882,15 +15126,18 @@
 7c6d62 apple, inc
 7c6f06 caterpillar trimble control technologies
 7c7673 enmas gmbh
-7c7be4 z'sedai kenkyusho corporation
+7c7a91 intel corporate
+7c7be4 z'sedai kenkyusho corporation
 7c7d41 jinmuyu electronics co., ltd.
 7c822d nortec
 7c8ee4 texas instruments
 7c94b2 philips healthcare pcci
 7c9a9b vse valencia smart energy
-7ca29b d.signt gmbh & co. kg
+7ca15d gn resound a/s
+7ca29b d.signt gmbh & co. kg
 7ca61d mhl, llc
 7cacb2 bosch software innovations gmbh
+7cad74 cisco
 7cb03e osram ag
 7cb21b cisco spvtg
 7cb232 tcl king high frequency ei,co.,ltd
@@ -14902,9 +15149,11 @@
 7cc8ab acro associates, inc.
 7cc8d0 tianjin yaan technology co., ltd.
 7cc8d7 damalisk
-7ccb0d aaxeon technologies inc.
+7ccb0d antaira technologies, llc
 7ccfcf shanghai seari intelligent system co., ltd
 7cd1c3 apple inc
+7cd762 freestyle technology pty ltd
+7cd844 enmotus inc
 7cd9fe new cosmos electric co., ltd.
 7cda84 dongnian networks inc.
 7cdd11 chongqing mas sci&tech.co.,ltd
@@ -14920,6 +15169,7 @@
 7cf098 bee beans technologies, inc.
 7cf0ba linkwell telesystems pvt ltd
 7cf429 nuuo inc.
+7cfadf apple
 7cfe28 salutron inc.
 80000b intel corporate
 800010 att bell laboratories
@@ -14963,6 +15213,8 @@
 8081a5 tongqing communication equipment (shenzhen) co.,ltd
 808287 atcom technology co.ltd.
 808698 netronics technologies inc.
+8086f2 intel corporate
+808b5c shenzhen runhuicheng technology co., ltd
 80912a lih rong electronic enterprise co., ltd.
 8091c0 agilemesh, inc.
 80929f apple
@@ -14990,12 +15242,14 @@
 80d733 qsr automations, inc.
 80db31 power quotient international co., ltd.
 80ee73 shuttle inc.
-80f593 irco sistemas de telecomunicación s.a.
+80f593 irco sistemas de telecomunicación s.a.
 80f62e hangzhou h3c technologies co., limited
+80fa5b clevo co.
 80fb06 huawei technologies co.,ltd
 80ffa8 unidis
 8400d2 sony ericsson mobile communications ab
 840b2d samsung electro-mechanics co., ltd
+841715 gp electronics (hk) ltd.
 841888 juniper networks
 841b5e netgear
 842141 shenzhen ginwave technologies ltd.
@@ -15007,6 +15261,7 @@
 842b2b dell inc.
 842b50 huria co.,ltd.
 842bbc modelleisenbahn gmbh
+842f75 innokas group
 8430e5 skyhawke technologies, llc
 843497 hewlett packard
 843611 hyungseul publishing networks
@@ -15018,22 +15273,29 @@
 845181 samsung electronics co.,ltd
 845787 dvr c&c co., ltd.
 845dd7 shenzhen netcom electronics co.,ltd
+846223 shenzhen coship electronics co., ltd.
+8462a6 eurocb (phils), inc.
 846aed wireless tsukamoto.,co.ltd
 846eb1 park assist llc
 84742a zte corporation
 8478ac cisco
+847a88 htc corporation
 847e40 texas instruments
 8482f4 beijing huasun unicreate technology co., ltd
 848506 apple inc
 848d84 rajant corporation
+848e96 embertec pty ltd
 848f69 dell inc.
-849000 arnold & richter cine technik
+849000 arnold & richter cine technik
 8497b8 memjet inc.
+849ca6 arcadyan technology corporation
 849dc5 centera photonics inc.
 84a6c8 intel corporate
 84a8e4 huawei device co., ltd
 84a991 cyber trans japan co.,ltd.
+84aca4 beijing novel super digital tv technology co., ltd
 84af1f beat system service co,. ltd.
+84c2e4 jiangsu qinheng co., ltd.
 84c727 gnodal ltd
 84c7a9 c3po s.a.
 84c8b1 incognito software inc.
@@ -15041,32 +15303,43 @@
 84d32a ieee p1905.1
 84d9c8 unipattern co.,
 84db2f sierra wireless inc
+84dd20 texas instruments
 84de3d crystal vision ltd
 84df0c net2grid bv
 84e714 liang herng enterprise,co.ltd.
 84ea99 vieworks
+84ed33 bbmc co.,ltd
+84f493 oms spol. s.r.o.
 84f64c cross point bv
 84fcfe apple
+880905 mtmcommunications
 881036 panodic(shenzhen) electronics limted
+881544 meraki, inc.
 8818ae tamron co., ltd
 882012 lmi technologies
 8821e3 nebusens, s.l.
 8823fe tttech computertechnik ag
 88252c arcadyan technology corporation
+882e5a storone
 88308a murata manufactuaring co.,ltd.
+88329b samsung electro mechanics co.,ltd.
+883314 texas instruments
 8841c1 orbisat da amazonia ind e aerol sa
-8843e1 cisco systems
+8843e1 cisco systems, inc.
 884b39 siemens ag, healthcare sector
+8851fb hewlett packard
 88532e intel corporate
 885395 apple
 8853d4 huawei technologies co., ltd
 885c4f alcatel lucent
 88615a siano mobile silicon ltd.
+88685c shenzhen chuangdao & perpetual eternal technology co.,ltd
 886b76 china hopeful group hopeful electric co.,ltd
 887556 cisco
 8886a0 simton technologies, ltd.
 888717 canon inc.
 8887dd darbeevision inc.
+888964 gsi electronics inc.
 888b5d storage appliance corporation
 888c19 brady corp asia pacific ltd
 8891dd racktivity
@@ -15086,6 +15359,7 @@
 88bfd5 simple audio ltd
 88c36e beijing ereneben lnformation technology limited
 88c663 apple, inc.
+88cb87 apple
 88d7bc dep company
 88dc96 senao networks, inc.
 88dd79 voltaire
@@ -15095,11 +15369,12 @@
 88e7a6 iknowledge integration corp.
 88e917 tamaggo
 88ed1c cudo communication co., ltd.
-88f077 cisco systems
+88f077 cisco systems, inc.
 88f488 cellon communications technology(shenzhen)co.,ltd.
 88f490 jetmobile pte ltd
 88fd15 lineeye co., ltd
 8c04ff technicolor usa inc.
+8c078c flow data inc
 8c0c90 ruckus wireless
 8c0ca3 amper
 8c0ee3 guangdong oppo mobile telecommunications corp.,ltd.
@@ -15122,9 +15397,10 @@
 8c57fd lvx western
 8c5877 apple, inc.
 8c598b c technologies ab
+8c5af0 exeltech solar products
 8c5ca1 d-broad,inc
 8c5fdf beijing railway signal factory
-8c604f cisco systems
+8c604f cisco systems, inc.
 8c640b beyond devices d.o.o.
 8c6422 sony ericsson mobile communications ab
 8c6878 nortek-as
@@ -15132,7 +15408,9 @@
 8c705a intel corporate
 8c71f8 samsung electronics co.,ltd
 8c736e fujitsu limited
+8c76c1 goden tech limited
 8c7712 samsung electronics co.,ltd
+8c7716 longcheer telecommunication limited
 8c7b9d apple, inc.
 8c7cb5 hon hai precision ind. co.,ltd.
 8c7cff brocade communications systems, inc.
@@ -15148,12 +15426,13 @@
 8ca048 beijing netopchip technology co.,ltd
 8ca982 intel corporate
 8cae4c plugable technologies
-8cb64f cisco systems
+8cb64f cisco systems, inc.
 8cb82c ipitomy communications
 8cb864 acsip technology corp.
 8cc121 panasonic avc networks company
 8cc5e1 shenzhen konka telecommunication technology co.,ltd
 8cc7aa radinet communications inc.
+8cc7d0 zhejiang ebang communication co.,ltd
 8cc8cd samsung electronics co., ltd
 8ccde8 nintendo co., ltd.
 8ccf5c befega gmbh
@@ -15183,6 +15462,7 @@
 9018ae shanghai meridian technologies, co. ltd.
 901900 scs sa
 901b0e fujitsu technology solutions gmbh
+901d27 zte corporation
 901edd great computer corporation
 902155 htc corporation
 9027e4 apple, inc.
@@ -15202,15 +15482,19 @@
 905446 tes electronic solutions
 9055ae ericsson, eab/rwi/k
 905682 lenbrook industries limited
+905692 autotalks ltd.
 9059af texas instruments
+905f2e tct mobile limited
 905f8d modas gmbh
 90610c fida international (s) pte ltd
 9067b5 alcatel-lucent
 9067f3 alcatel lucent
-906dc8 dlg automação industrial ltda
+906dc8 dlg automação industrial ltda
 906ebb hon hai precision ind. co.,ltd.
 907025 garea microsys co.,ltd.
+907af1 snupi technologies
 907f61 chicony electronics co., ltd.
+908260 ieee 1904.1 working group
 90840d apple, inc
 9088a2 ionics technology me ltda
 908d1d gh technologies
@@ -15239,6 +15523,7 @@
 90d7eb texas instruments
 90d852 comtec co., ltd.
 90d92c hug-witschi ag
+90da4e avanu
 90e0f0 ieee p1722
 90e2ba intel corporation
 90e6ba asustek computer inc.
@@ -15249,24 +15534,25 @@
 90f72f phillips machine & welding co., inc.
 90fb5b avaya, inc
 90fba6 hon hai precision ind.co.ltd
+90ff79 metro ethernet forum
 940070 nokia corporation
 940149 autohotbox
 940b2d netview technologies(shenzhen) co., ltd
 940c6d tp-link technologies co.,ltd.
-9411da itf froschl gmbh
+9411da itf fröschl gmbh
 941673 point core sarl
 941d1c tlab west systems ab
 942053 nokia corporation
 942197 stalmart technology limited
 94236e shenzhen junlan electronic ltd
 942e17 schneider electric canada inc
-942e63 finsécur
+942e63 finsécur
 94319b alphatronics bv
 9433dd taco electronic solutions, inc.
 9439e5 hon hai precision ind. co.,ltd.
 943af0 nokia corporation
 944444 lg innotek
-944452 belkin international, inc.
+944452 belkin international inc.
 944696 baudtec corporation
 944a09 bitwise controls
 945103 samsung electronics
@@ -15275,24 +15561,30 @@
 946124 pason systems
 9463d1 samsung electronics co.,ltd
 9471ac tct mobile limited
+94756e qinetiq north america
 9481a4 azuray technologies
 94857a evantage industries corp
 948854 texas instruments
 948b03 eaget innovation and technology co., ltd.
 948d50 beamex oy ab
 948fee hughes telematics, inc.
+949426 apple
+9498a2 shanghai listen tech.ltd
 949bfd trans new technology, inc.
 949c55 alta data technologies
 94a7bc bodymedia, inc.
 94aab8 joview(beijing) technology co. ltd.
+94acca trivum technologies gmbh
 94ae61 alcatel lucent
-94ba31 visiontec da amazônia ltda.
+94ba31 visiontec da amazônia ltda.
 94c4e9 powerlayer microsystems hongkong limited
 94c6eb nova electronics, inc.
 94c7af raylios technology
+94c962 teseq ag
 94ca0f honeywell analytics
 94ccb9 motorola mobility, inc.
 94cdac creowave oy
+94ce2c sony mobile communications ab
 94d019 cydle corp.
 94d723 shanghai dareglobal technologies co., ltd
 94d93c enelps
@@ -15306,6 +15598,7 @@
 94e226 d. ortiz consulting, llc
 94e711 xirka dama persada pt
 94e848 fylde micro ltd
+94ebcd research in motion limited
 94f692 geminico co.,ltd.
 94f720 tianjin deviser electronics instrument co., ltd
 94fae8 shenzhen eycom technology co., ltd
@@ -15316,6 +15609,7 @@
 9803a0 abb n.v. power quality products
 9803d8 apple, inc.
 980c82 samsung electro mechanics
+980d2e htc corporation
 980ee4 
 98208e definium technologies
 98262a applied research associates, inc
@@ -15324,19 +15618,24 @@
 982cbe 2wire
 982d56 resolution audio
 983000 beijing kemacom technologies co., ltd.
+983071 daikyung vascom
 983571 sub10 systems ltd
 9835b8 assembled products corporation
+983f9f china ssj (suzhou) network technology inc.
 984246 sol industry pte., ltd
 98473c shanghai sunmon communication technogy co.,ltd
 984a47 chg hospital beds
 984b4a motorola mobility inc.
 984be1 hewlett-packard company
+984c04 zhangzhou keneng electrical equipment co ltd
 984cd3 mantis deposition
 984e97 starlight marketing (h. k.) ltd.
+984fee intel corporate
 9852b1 samsung electronics
 9857d3 hon hai-ccpbg  precision ind.co.,ltd.
 98588a sysgration ltd.
 985945 texas instruments
+985c93 sbg systems sas
 985e1b conversdigital co., ltd.
 986022 emw co., ltd.
 9866ea industrial control communications, inc.
@@ -15348,8 +15647,9 @@
 988b5d sagem communication
 988bad corintech ltd.
 988e34 zhejiang boxsam electronic co.,ltd
-988edd raychem international
+988edd te connectivity limerick
 989080 linkpower network system inc ltd.
+9893cc lg electronics inc.
 989449 skyworth wireless technology ltd.
 98a7b0 mcst zao
 98aad7 blue wave networking co ltd
@@ -15359,6 +15659,7 @@
 98c845 packetaccess
 98d686 chyi lee industry co., ltd.
 98d6bb apple, inc.
+98d6f7 lg electronics
 98d88c nortel networks
 98dcd9 unitec co., ltd.
 98e165 accutome
@@ -15376,17 +15677,20 @@
 9c066e hytera communications corporation limited
 9c0dac tymphany hk limited
 9c1874 nokia danmark a/s
+9c1c12 aruba networks
 9c1fdd accupix inc.
 9c207b apple inc
 9c220e tascan service gmbh
 9c28bf continental automotive czech republic s.r.o.
 9c2a70 hon hai precision ind. co.,ltd.
+9c3178 foshan huadian intelligent communications teachnologies co.,ltd
 9c31b6 kulite semiconductor products inc
+9c3aaf samsung electronics co.,ltd
 9c417c hame  technology co.,  limited
 9c4563 dimep sistemas
 9c4a7b nokia corporation
 9c4cae mesa labs
-9c4e20 cisco systems
+9c4e20 cisco systems, inc.
 9c4e36 intel corporate
 9c4e8e alt systems ltd
 9c53cd engicam s.r.l.
@@ -15395,7 +15699,7 @@
 9c55b4 i.s.e. s.r.l.
 9c5711 feitian xunda(beijing) aeronautical information technology co., ltd.
 9c5b96 nmr corporation
-9c5c8d firemax indÚstria e comÉrcio de produtos eletrÔnicos ltda
+9c5c8d firemax indÚstria e comÉrcio de produtos eletrÔnicos  ltda
 9c5d12 aerohive networks inc
 9c5d95 vtc electronics corp.
 9c5e73 calibre uk ltd
@@ -15413,11 +15717,14 @@
 9c8edc teracom limited
 9c934e xerox corporation
 9c95f8 smartdoor systems, llc
+9c9726 technicolor
+9c9811 guangzhou sunrise electronics development co., ltd
 9c9c1d starkey labs inc.
 9ca134 nike, inc.
 9ca3ba sakura internet inc.
+9ca577 osorno enterprises inc.
 9cadef obihai technology, inc.
-9cafca cisco systems
+9cafca cisco systems, inc.
 9cb008 ubiquitous computing technology corporation
 9cb206 procentec
 9cb70d liteon technology corporation
@@ -15432,23 +15739,27 @@
 9cdf03 harman/becker automotive systems gmbh
 9ce10e nctech ltd
 9ce1d6 junger audio-studiotechnik gmbh
+9ce635 nintendo co., ltd.
+9ce6e7 samsung electronics co.,ltd
 9cebe8 bizlink (kunshan) co.,ltd
 9cf61a utc fire and security
 9cf67d ricardo prague, s.r.o.
 9cf938 areva np gmbh
 9cffbe otsl inc.
+a00363 robert bosch healthcare gmbh
 a00798 samsung electronics
 a007b6 advanced technical support, inc.
 a00abf wieson technologies co., ltd.
 a00bba samsung electro-mechanics
 a00ca1 sktb "skit"
-a0133b copyright © hiti digital, inc.
+a0133b copyright © hiti digital, inc.
 a0165c tangotec ltd.
 a01859 shenzhen yidashi electronics co ltd
 a01917 bertel s.p.a.
+a01c05 nimax telecom co.,ltd.
 a02195 samsung electronics digital imaging
 a021b7 netgear
-a0231b telecomp r&d corp.
+a0231b telecomp r&d corp.
 a02ef3 united integrated services co., led.
 a0369f intel corporation
 a036f0 comprehensive power
@@ -15474,12 +15785,16 @@
 a06e50 nanotek elektronik sistemler ltd. sti.
 a071a9 nokia corporation
 a07332 cashmaster international limited
+a073fc rancore technologies private limited
 a07591 samsung electronics co.,ltd
 a078ba pantech co., ltd.
+a0821f samsung electronics co.,ltd
 a082c7 p.t.i co.,ltd
+a0861d chengdu fuhuaxin technology co.,ltd
 a086ec saehan hitec co., ltd
 a08869 intel corporate
 a088b4 intel corporate
+a08a87 huizhou kaiyue electronic co.,ltd
 a08c15 gerhard d. wempe kg
 a08c9b xtreme technologies corp
 a090de veedims,llc
@@ -15496,7 +15811,7 @@
 a0bab8 pixon imaging
 a0bfa5 coresys
 a0c3de triton electronic systems ltd.
-a0cf5b cisco systems
+a0cf5b cisco systems, inc.
 a0dc04 becker-antriebe gmbh
 a0dd97 polarlink technologies, ltd
 a0dde5 sharp corporation
@@ -15506,50 +15821,55 @@
 a0e295 dat system co.,ltd
 a0e534 stratec biomedical ag
 a0e9db ningbo freewings technologies co.,ltd
+a0eb76 aircuve inc.
 a0ef84 seine image int'l co., ltd
 a0f217 ge medical system(china) co., ltd.
 a0f3c1 tp-link technologies co., ltd.
 a0f3e4 alcatel lucent ipd
 a0f419 nokia corporation
 a0f450 htc corporation
+a0fe91 avat automation gmbh
 a40130 abisystems co., ltd
 a40bed carry technology co.,ltd
-a40cc3 cisco systems
+a40cc3 cisco systems, inc.
 a4134e luxul
 a41731 hon hai precision ind. co.,ltd.
-a41875 cisco systems
+a41875 cisco systems, inc.
 a41bc0 fastec imaging corporation
 a41f72 dell inc.
 a4218a nortel networks
 a424b3 flatfrog laboratories ab
 a429b7 bluesky
+a42c08 masterwork automodules
 a433d1 fibrlink communications co.,ltd.
 a438fc plastic logic
 a4466b eoc technology
 a446fa amtran video corporation
 a44b15 sun cupid technology (hk) ltd
-a44c11 cisco systems
+a44c11 cisco systems, inc.
 a44e2d adaptive wireless solutions, llc
 a44e31 intel corporate
 a45055 busware.de
 a4526f adb broadband italia
 a4561b mcot corporation
-a45630 cisco systems
+a45630 cisco systems, inc.
 a45a1c smart-electronic gmbh
 a45c27 nintendo co., ltd.
 a46706 apple, inc.
 a46e79 dft system co.ltd
 a479e4 klinfo corp
 a47aa4 motorola mobility, inc.
+a47acf vibicom communications inc.
 a47c14 chargestorm ab
 a47c1f global microwave systems inc.
 a4856b q electronics ltd
 a49005 china greatwall computer shenzhen co.,ltd
-a4934c cisco systems
+a4934c cisco systems, inc.
 a497bb hitachi industrial equipment systems co.,ltd
 a49947 huawei technologies co., ltd
 a49981 fujian elite power tech co.,ltd.
 a49b13 burroughs payment systems, inc.
+a49edb autocrib, inc.
 a4a24a cisco spvtg
 a4a80f shenzhen coship electronics co., ltd.
 a4ad00 ragsdale technology
@@ -15561,6 +15881,7 @@
 a4b1ee h. zander gmbh & co. kg
 a4b2a7 adaxys solutions ag
 a4b36a jsc sdo chromatec
+a4b818 penta gesellschaft für elektronische industriedatenverarbeitung mbh
 a4b980 parking boxx inc.
 a4badb dell inc.
 a4be61 eutrovision system, inc.
@@ -15569,35 +15890,45 @@
 a4d18f shenzhen skyee optical fiber communication technology ltd.
 a4d1d1 ecotality north america
 a4d1d2 apple, inc.
+a4d856 qualcomm labs inc.
 a4da3f bionics corp.
 a4db2e kingspan environmental ltd
 a4de50 total walther gmbh
-a4e32e silicon & software systems ltd.
+a4e0e6 filizola s.a. pesagem e automacao
+a4e32e silicon & software systems ltd.
 a4e391 deny fontaine
 a4e731 nokia corporation
 a4e7e4 connex gmbh
+a4e991 sistemas audiovisuales itelsis s.l.
+a4ebd3 samsung electronics co.,ltd
 a4ed4e motorola mobility, inc.
 a4ee57 seiko epson corporation
 a4ef52 telewave co., ltd.
 a4f7d0 lan accessories co., ltd.
+a80180 imago technologies gmbh
+a80600 samsung electronics co.,ltd
+a8154d tp-link technologies co.,ltd.
 a816b2 lg electronics
-a81758 elektronik system i umeå ab
+a81758 elektronik system i umeå ab
 a81b18 xts corp
 a81faf krypton polska
 a82066 apple inc
 a826d9 htc corporation
+a8294c precision optical transceivers, inc.
 a82bd6 shina system co., ltd
 a830ad wei fang goertek electronics co.,ltd
 a83944 actiontec electronics, inc
 a84041 dragino technology co., limited
+a84481 nokia corporation
 a845e9 firich enterprises co., ltd.
 a849a5 lisantech co., ltd.
 a854b2 wistron neweb corp.
 a8556a pocketnet technology inc.
 a85bb0 shenzhen dehoo technology co.,ltd
 a85bf3 audivo gmbh
+a861aa cloudview limited
 a862a2 jiwumedia co., ltd.
-a863df displ’aire corporation
+a863df displaire corporation
 a863f2 texas instruments
 a865b2 dongguan yishang electronic technology co., limited
 a86a6f rim
@@ -15611,19 +15942,20 @@
 a88cee micromade galka i drozdz sp.j.
 a8922c lg electronics
 a893e6 jiangxi jinggangshan cking communication technology co.,ltd
+a895b0 aker subsea ltd
 a8968a apple
 a898c6 shinbo co., ltd.
 a8995c aizo ag
 a89b10 inmotion ltd.
 a8ad3d alcatel-lucent shanghai bell co., ltd
 a8b0ae leoni
-a8b1d4 cisco systems
+a8b1d4 cisco systems, inc.
 a8bd1a honey bee (hong kong) limited
 a8c222 tm-research inc.
 a8cb95 east best co., ltd.
 a8ce90 cvc
 a8d0e5 juniper networks
-a8d3c8 wachendorff elektronik  gmbh & co. kg
+a8d3c8 wachendorff elektronik  gmbh & co. kg
 a8e018 nokia corporation
 a8e3ee sony computer entertainment inc.
 a8ef26 tritonwave
@@ -15647,16 +15979,19 @@
 ac14d2 wi-daq, inc.
 ac162d hewlett packard
 ac1702 fibar group sp. z o.o.
+ac1826 seiko epson corporation
 ac199f sungrow power supply co.,ltd.
 ac20aa dmatek co., ltd.
 ac2fa8 humannix co.,ltd.
 ac319d shenzhen tg-net botone technology co.,ltd.
 ac34cb shanhai gbcom communication technology co. ltd
+ac3c0b apple
 ac3cb4 nilan a/s
 ac3d05 instorescreen aisa
 ac3d75 hangzhou zhiway technologies co.,ltd.
 ac3fa4 taiyo yuden co.,ltd
 ac40ea c&t solution inc.
+ac4122 eclipse electronic systems inc.
 ac44f2 revolabs inc
 ac4723 genelec
 ac4afe hisense broadband multimedia technology co.,ltd.
@@ -15677,6 +16012,7 @@
 ac7236 lexking technology co., ltd.
 ac7289 intel corporate
 ac7a42 iconnectivity
+ac7ba1 intel corporate
 ac80d6 hexatronic ab
 ac8112 gemtek technology co., ltd.
 ac81f3 nokia corporation
@@ -15691,8 +16027,9 @@
 ac9a96 lantiq deutschland gmbh
 ac9b84 smak tecnologia e automacao
 ac9ce4 alcatel-lucent shanghai bell co., ltd
-aca016 cisco systems
+aca016 cisco systems, inc.
 aca22c baycity technologies ltd
+aca430 peerless av
 acab8d lyngso marine a/s
 acbd0b imac co.,ltd
 acbe75 ufine technologies co.,ltd.
@@ -15709,25 +16046,31 @@
 acd180 crexendo business solutions, inc.
 acd364 abb spa, abb sace div.
 acd9d6 tci gmbh
+acdbda shenzhen geniatech inc, ltd
 acde48 
 ace215 huawei technologies co., ltd
 ace348 madgetech, inc
 ace64b shenzhen baojia battery technology co., ltd.
 ace87b huawei technologies co., ltd
 ace87e bytemark computer consulting ltd
+ace97f iot tech limited
 ace9aa hay systems ltd
 acea6a genix infocomm co., ltd.
 acee3b 6harmonics inc
 acf0b2 becker electronics taiwan ltd.
 acf1df d-link international
 acf2c5 cisco
+acf7f3 xiaomi corporation
 acf97e elesys inc.
 b01203 dynamics hong kong limited
 b01266 futaba-kikaku
+b01408 lightspeed international co.
+b01743 edison global circuits llc
 b01b7c ontrol a.s.
 b01c91 elim co
 b0358d nokia corporation
 b03829 siliconware precision industries co., ltd.
+b03850 nanjing cas-zdc iot system co.,ltd
 b0435d nuleds, inc.
 b046fc mitrastar technology corp.
 b0487a tp-link technologies co., ltd.
@@ -15744,6 +16087,7 @@
 b07994 motorola mobility llc
 b07d62 dipl.-ing. h. horstmann gmbh
 b081d8 i-sys corp
+b08807 strata worldwide
 b08991 lge
 b08e1a uradio systems co., ltd
 b09074 fulan electronics limited
@@ -15759,14 +16103,17 @@
 b0acfa fujitsu limited
 b0b2dc zyxel communications corporation
 b0b32b slican sp. z o.o.
+b0b448 texas instruments
 b0b8d5 nanjing nengrui auto equipment co.,ltd
 b0bd6d echostreams innovative solutions
 b0bda1 zaklad elektroniczny sims
 b0bf99 wizitdongdo
+b0c4e7 samsung electronics
 b0c69a juniper networks
 b0c745 buffalo inc.
 b0c83f jiangsu cynray iot co., ltd.
 b0c8ad people power company
+b0c95b beijing symtech co.,ltd
 b0cf4d mi-zone technology ireland
 b0d09c samsung electronics co.,ltd
 b0d2f5 vello systems, inc.
@@ -15778,6 +16125,7 @@
 b0ec71 samsung electronics co.,ltd
 b0ee45 azurewave technologies, inc.
 b0f1bc dhemax ingenieros ltda
+b0faeb cisco
 b4009c cableworld ltd.
 b40142 gci science & technology co.,ltd
 b40418 smartchip integrated inc.
@@ -15787,7 +16135,7 @@
 b40c25 palo alto networks
 b40e96 heran
 b40edc lg-ericsson co.,ltd.
-b41489 cisco systems
+b41489 cisco systems, inc.
 b41def internet laboratories, inc.
 b4211d beijing guangxin technology co., ltd
 b4218a dog hunter llc
@@ -15812,6 +16160,7 @@
 b46293 samsung electronics co.,ltd
 b467e9 qingdao goertek technology co., ltd.
 b4749f askey computer corp
+b47f5e foresight manufacture (s) pte ltd
 b48255 research products corporation
 b482c5 relay2, inc.
 b482fe askey computer corp
@@ -15822,7 +16171,7 @@
 b49db4 axion technologies inc.
 b49ee6 shenzhen technology co ltd
 b4a4b5 zen eye co.,ltd
-b4a4e3 cisco systems
+b4a4e3 cisco systems, inc.
 b4a5a9 modi gmbh
 b4aa4d ensequence, inc.
 b4ab2c mtm technology corporation
@@ -15838,10 +16187,12 @@
 b4cfdb shenzhen jiuzhou electric co.,ltd
 b4d8a9 betterbots
 b4d8de iota computing, inc.
+b4dd15 controlthings oy ab
 b4df3b chromlech
 b4dffa litemax electronics inc.
 b4e0cd io turbine, inc.
 b4e1eb 
+b4e9b0 cisco
 b4ed19 pie digital, inc.
 b4ed54 wohler technologies
 b4eed4 texas instruments
@@ -15849,46 +16200,55 @@
 b4f2e8 pace plc
 b4f323 petatel inc.
 b4fc75 sema electronics(hk) co.,ltd
+b4fe8c centro sicurezza italia spa
 b80305 intel corporate
 b80415 bayan audio
 b80b9d ropex industrie-elektronik gmbh
 b81413 keen high holding(hk) ltd.
+b81619 motorola mobility, inc.
 b817c2 apple, inc.
 b81999 nesys
 b820e7 guangzhou horizontal information & network integration co. ltd
 b82410 magneti marelli slovakia s.r.o.
-b826d4 furukawa industrial s.a. produtos elétricos
+b826d4 furukawa industrial s.a. produtos elétricos
 b827eb raspberry pi foundation
 b8288b parker hannifin
 b829f7 blaster tech
-b82adc efr europäische funk-rundsteuerung gmbh
+b82adc efr europäische funk-rundsteuerung gmbh
 b82ca0 honeywell hommed
+b838ca kyokko tsushin system co.,ltd
 b83a7b worldplay (canada) inc.
 b83d4e shenzhen cultraview digital technology co.,ltd shanghai branch
 b83e59 roku, inc
 b8415f asp ag
 b85510 zioncom electronics (shenzhen) ltd.
 b85810 numera, inc.
+b85af7 ouya, inc
 b85afe handaer communication technology (beijing) co., ltd
+b86091 onnet technologies and innovations llc
 b8616f accton wireless broadband(awb), corp.
-b8621f cisco systems
+b8621f cisco systems, inc.
+b863bc robotis, co, ltd
 b86491 ck telecom ltd
 b8653b bolymin, inc.
 b86b23 toshiba
 b870f4 compal information (kunshan) co., ltd.
 b87424 viessmann elektronik gmbh
 b87447 convergence technologies
+b8763f hon hai precision ind. co.,ltd.
 b877c3 decagon devices, inc.
+b8782e apple
 b8797e secure meters (uk) limited
 b8871e good mind industries co., ltd.
 b888e3 compal information (kunshan) co., ltd
 b889ca iljin electric co., ltd.
+b88a60 intel corporate
 b88d12 apple, inc.
 b88e3a infinite technologies jlt
 b88f14 analytica gmbh
-b8921d bg t&a
+b8921d bg t&a
 b894d2 retail innovation htt ab
-b89674 alldsp gmbh & co. kg
+b89674 alldsp gmbh & co. kg
 b8975a biostar microtech int'l corp.
 b898b0 atlona inc.
 b89aed oceanserver technology, inc
@@ -15897,6 +16257,7 @@
 b8a3e0 benrui technology co.,ltd
 b8a8af logic s.p.a.
 b8ac6f dell inc
+b8ae6e nintendo co., ltd.
 b8af67 hewlett-packard company
 b8b1c7 bt&com co.,ltd
 b8b42e gionee communication equipment co,ltd.shenzhen
@@ -15905,10 +16266,12 @@
 b8ba68 xi'an jizhong digital communication co.,ltd
 b8ba72 cynove
 b8bb6d eneres co.,ltd.
-b8bebf cisco systems
+b8bebf cisco systems, inc.
+b8c46f primmcon industries inc
 b8c68e samsung electronics co.,ltd
 b8c716 fiberhome telecommunication technologies co.,ltd
 b8c75d apple, inc.
+b8ca3a dell pcba test
 b8cda7 maxeler technologies ltd.
 b8d06f guangzhou hkust fok ying tung research institute
 b8d49d m seven system ltd.
@@ -15936,8 +16299,10 @@
 bc125e beijing  wisvideo  inc.
 bc1401 hitron technologies. inc
 bc15a6 taiwan jantek electronics,ltd.
+bc1665 cisco
 bc20a4 samsung electronics
 bc20ba inspur (shandong) electronic information co., ltd
+bc261d hong kong tecon technology
 bc2846 nextbit computing pvt. ltd.
 bc28d6 rowley associates limited
 bc2c55 bear flag design, inc.
@@ -15945,6 +16310,7 @@
 bc35e5 hydro systems company
 bc38d2 pandachip limited
 bc39a6 csun system technology co.,ltd
+bc3baf apple
 bc3e13 accordance systems inc.
 bc4377 hang zhou huite technology co.,ltd.
 bc4760 samsung electronics co.,ltd
@@ -15953,12 +16319,14 @@
 bc51fe swann communications pty ltd
 bc52b7 apple inc
 bc5ff4 asrock incorporation
+bc629f telenet systems p. ltd.
 bc6778 apple inc
 bc6784 environics oy
 bc6a16 tdvine
 bc6a29 texas instruments
 bc6e76 green energy options ltd
 bc71c1 xtrillion, inc.
+bc72b1 samsung electronics co.,ltd
 bc764e rackspace us, inc.
 bc7670 huawei device co., ltd
 bc7737 intel corporate
@@ -15969,6 +16337,7 @@
 bc83a7 shenzhen chuangwei-rgb electronics co.,lt
 bc851f samsung electronics
 bc8b55 npp eliks america inc. dba t&m atlantic
+bc926b apple
 bc99bc fonsee technology inc.
 bc9da5 dascom europe gmbh
 bca4e1 nabto
@@ -15977,13 +16346,16 @@
 bcb181 sharp corporation
 bcb1f3 samsung electronics
 bcb852 cybera, inc.
+bcbae1 arec inc.
 bcbbc9 kellendonk elektronik gmbh
 bcc168 dinbox sverige ab
 bcc23a thomson video networks
 bcc61a spectra embedded systems
+bcc6db nokia corporation
 bcc810 cisco spvtg
 bccd45 voismart
 bccfcc htc corporation
+bcd177 tp-link technologies co.,ltd.
 bcd5b6 d2d technologies
 bcd940 asr co,.ltd.
 bce09d eoslink
@@ -15994,13 +16366,14 @@
 bcfe8c altronic, llc
 bcffac topcon corporation
 c00d7e additech, inc.
+c011a6 fort-telecom ltd.
 c01242 alpha security products
 c0143d hon hai precision ind. co.,ltd.
 c01885 hon hai precision ind. co.,ltd.
 c01e9b pixavi as
 c02250 
 c02506 avm gmbh
-c027b9 beijing national railway research & design institute  of signal & communication
+c027b9 beijing national railway research & design institute  of signal & communication co., ltd.
 c02973 audyssey laboratories inc.
 c029f3 xysystem
 c02bfc ines. applied informatics gmbh
@@ -16011,18 +16384,23 @@
 c03f0e netgear
 c03f2a biscotti, inc.
 c041f6 lg electronics inc
+c04301 epec oy
 c044e3 shenzhen sinkna electronics co., ltd
 c0493d maitrise technologique
+c04a00 tp-link technologies co.,ltd.
+c04df7 serelec
 c058a7 pico systems co., ltd.
+c05e6f v. stonkaus firma "kodinis raktas"
 c05e79 shenzhen huaxun ark technologies co.,ltd
-c0626b cisco systems
+c0626b cisco systems, inc.
 c06c0f dobbs stanford
 c07e40 shenzhen xdk communication equipment co.,ltd
 c08170 effigis geosolutions
 c0830a 2wire
 c0847a apple, inc.
+c0885b snd tech co., ltd.
 c08ade ruckus wireless
-c08b6f s i sistemas inteligentes eletronicos ltda
+c08b6f s i sistemas inteligentes eletrônicos ltda
 c09132 patriot memory
 c09134 procurve networking by hp
 c09c92 coby
@@ -16031,18 +16409,20 @@
 c0a0de multi touch oy
 c0a0e2 eden innovations
 c0a26d abbott point of care
-c0a364 3d systems burlington
+c0a364 3d systems massachusetts
 c0aa68 osasi technos inc.
 c0ac54 sagemcom
 c0b339 comigo ltd.
 c0b357 yoshiki electronics industry ltd.
+c0b8b1 bitbox ltd
 c0bae6 application solutions (safety and security) ltd
 c0bd42 zpa smart energy a.s.
 c0c1c0 cisco-linksys, llc
+c0c3b6 automatic systems
 c0c520 ruckus wireless
 c0c946 mitsuya laboratories inc.
 c0cb38 hon hai precision ind. co.,ltd.
-c0cfa3 creative electronics & software, inc.
+c0cfa3 creative electronics & software, inc.
 c0d044 sagemcom
 c0d962 askey computer corp.
 c0df77 conrad electronic se
@@ -16053,7 +16433,7 @@
 c40142 maxmedia technology limited
 c4017c ruckus wireless
 c401b1 seektech inc
-c40acb cisco systems
+c40acb cisco systems, inc.
 c40f09 hermes electronic gmbh
 c4108a ruckus wireless
 c416fa prysm inc
@@ -16062,6 +16442,7 @@
 c41ece hmi sources ltd.
 c4237a whiznets inc.
 c4242e galvanic applied sciences inc
+c42628 airo wireless
 c42c03 apple, inc.
 c436da rusteletech ltd.
 c438d3 tagatec co.,ltd
@@ -16073,24 +16454,29 @@
 c44619 hon hai precision ind. co.,ltd.
 c44ad0 fireflies rtls
 c44b44 omniprint inc.
+c44eac shenzhen shiningworth technology co., ltd.
 c455a6 cadac holdings ltd
 c455c2 bach-simpson
 c45600 galleon embedded computing
+c458c2 shenzhen tatfook technology co., ltd.
 c45976 fugoo
+c45dd8 hdmi forum
 c46044 everex electronics limited
 c46354 u-raku, inc.
-c46413 cisco systems
+c46413 cisco systems, inc.
 c467b5 libratone a/s
 c46ab7 xiaomi technology,inc.
 c46df1 datagravity
 c47130 fon technology s.l.
-c471fe cisco systems
+c471fe cisco systems, inc.
 c4731e samsung eletronics co., ltd
 c47b2f beijing joinhope image technology ltd.
 c47ba3 navis inc.
-c47d4f cisco systems
+c47d4f cisco systems, inc.
+c47dcc motorola solutions inc.
 c4823f fujian newland auto-id tech. co,.ltd.
 c48508 intel corporation
+c488e5 samsung electronics co.,ltd
 c49300 8devices
 c49313 100fio networks technology llc
 c495a2 shenzhen weijiu industry and trade development co., ltd
@@ -16105,8 +16491,11 @@
 c4d489 jiangsu joyque information industry co.,ltd
 c4d987 intel corporate
 c4da26 noblex sa
+c4e032 ieee 1904.1 working group
 c4e17c u2s co.
 c4e7be scspro co.,ltd
+c4ebe3 rrcn sas
+c4edba texas instruments
 c4eeae vss monitoring
 c4eef5 oclaro, inc.
 c4f464 spica international
@@ -16116,6 +16505,7 @@
 c80718 tdsi
 c80aa9 quanta computer inc.
 c80e77 le shi zhi xin electronic technology (tianjin)  co.,ltd
+c80e95 omnilync inc.
 c819f7 samsung electronics co.,ltd
 c81afe dlogic gmbh
 c81e8e adv security (s) pte ltd
@@ -16134,13 +16524,14 @@
 c84529 imk networks co.,ltd
 c84544 shanghai enlogic electric technology co., ltd.
 c848f5 medison xray co., ltd
-c84c75 cisco systems
+c84c75 cisco systems, inc.
 c85645 intermas france
 c86000 asustek computer inc.
 c864c7 zte corporation
 c86c1e display systems ltd
 c86c87 zyxel communications corp
 c86cb6 optcom co., ltd.
+c86f1d apple
 c87248 aplicom oy
 c87b5b zte corporation
 c87cbc valink co., ltd.
@@ -16152,10 +16543,11 @@
 c88a83 dongguan huahong electronics co.,ltd
 c88b47 nolangroup s.p.a con socio unico
 c8903e pakton technologies
+c89346 mxchip company limited
 c89383 embedded automation, inc.
 c894d2 jiangsu datang  electronic products co., ltd
 c8979f nokia corporation
-c89c1d cisco systems
+c89c1d cisco systems, inc.
 c89cdc elitegroup computer system co., ltd.
 c89f42 vdii innovation ab
 c8a030 texas instruments
@@ -16168,6 +16560,7 @@
 c8aacc 
 c8ae9c shanghai tyd elecronic technology co. ltd
 c8af40 marco systemanalyse und entwicklung gmbh
+c8b373 cisco-linksys, llc
 c8bbd3 embrane
 c8bcc8 apple, inc.
 c8be19 d-link international
@@ -16182,39 +16575,51 @@
 c8d3a3 d-link international
 c8d5fe shenzhen zowee technology co., ltd
 c8d719 cisco consumer products, llc
+c8ddc9 lenovo mobile communication technology ltd.
 c8de51 integra networks, inc.
 c8df7c nokia corporation
 c8e1a7 vertu corporation limited
 c8ee08 tangtop technology co.,ltd
+c8eea6 shenzhen shx technology co., ltd
 c8ef2e beijing gefei tech. co., ltd
 c8f406 avaya, inc
 c8f704 building block video
 c8f733 intel corporate
 c8f981 seneca s.r.l.
-c8f9f9 cisco systems
+c8f9f9 cisco systems, inc.
 c8fb26 cisco spvtg
 c8fe30 bejing dayo mobile communication technology ltd.
 cc0080 trust system co.,
+cc047c g-way microwave
 cc051b samsung electronics co.,ltd
 cc08e0 apple, inc.
 cc09c8 imaqliq ltd
 cc0cda miljovakt as
+cc0dec cisco spvtg
 cc14a6 yichun myenergy domain, inc
 cc187b manzanita systems, inc.
+cc1afa zte corporation
 cc1eff metrological group bv
 cc2218 innodigital co., ltd.
 cc262d verifi, llc
+cc2d8c lg electronics inc
 cc34d7 gewiss s.p.a.
+cc3a61 samsung electro mechanics co., ltd.
+cc3c3f sa.s.s. datentechnik ag
+cc3e5f hewlett packard
 cc43e3 trump s.a.
 cc4bfb hellberg safety ab
+cc4e24 brocade communications systems, inc.
 cc501c kvh industries, inc.
 cc5076 ocom communications, inc.
 cc52af universal global scientific industrial co., ltd.
+cc53b5 huawei technologies co.,ltd
 cc5459 ontime networks as
 cc55ad rim
 cc593e toumaz ltd
 cc5c75 weightech com. imp. exp. equip. pesagem ltda
 cc5d4e zyxel communications corporation
+cc5d57 information  system research institute,inc.
 cc60bb empower rf systems
 cc69b0 global traffic technologies, llc
 cc6b98 minetec wireless technologies
@@ -16222,6 +16627,7 @@
 cc6da0 roku, inc.
 cc6def tjk tietolaite oy
 cc7669 seetech
+cc785f apple
 cc7a30 cmax wireless co., ltd.
 cc7d37 motorola mobility, inc.
 cc7ee7 panasonic avc networks company
@@ -16232,7 +16638,7 @@
 cc96a0 huawei device co., ltd
 cc9e00 nintendo co., ltd.
 cca374 guangdong guanglian electronic technology co.ltd
-cca462 arris group, inc
+cca462 arris group, inc.
 ccaf78 hon hai precision ind. co.,ltd.
 ccb255 d-link international
 ccb3f8 fujitsu isotec limited
@@ -16255,7 +16661,7 @@
 cce7df american magnetics, inc.
 ccea1c dconworks  co., ltd
 cceed9 deto mechatronic gmbh
-ccef48 cisco systems
+ccef48 cisco systems, inc.
 ccf3a5 chi mei communication systems, inc
 ccf67a ayecka communication systems ltd
 ccf841 lumewave
@@ -16273,13 +16679,16 @@
 d01cbb beijing ctimes digital technology co., ltd.
 d023db apple, inc.
 d02788 hon hai precision ind.co.ltd
+d02db3 huawei technologies co., ltd
 d03110 ingenic semiconductor co.,ltd
 d03761 texas instruments
 d046dc southwest research institute
 d04cc1 sintrones technology corp.
+d05099 asrock incorporation
 d05162 sony mobile communications ab
+d052a8 physical graph corporation
 d0542d cambridge industries(group) co.,ltd.
-d0574c cisco systems
+d0574c cisco systems, inc.
 d05785 pantech co., ltd.
 d05875 active control technology inc.
 d059c3 ceramicro technology corporation
@@ -16290,28 +16699,33 @@
 d067e5 dell inc
 d0699e luminex lighting control equipment
 d0738e dong oh precision co., ltd.
-d075be reno a&e
+d073d5 lifi labs management pty ltd
+d075be reno a&e
 d07de5 forward pay systems, inc.
 d07e28 hewlett packard
 d08999 apcon, inc.
+d08b7e passif semiconductor
 d08cb5 texas instruments
 d08cff upwis ab
 d093f8 stonestreet one llc
 d09b05 emtronix
-d0a311 neuberger geb�udeautomation gmbh
+d0a311 neuberger gebäudeautomation gmbh
 d0aeec alpha networks inc.
 d0afb6 linktop technology co., ltd
 d0b33f shenzhen tinno mobile technology co.,ltd.
 d0b498 robert bosch llc automotive electronics
 d0b53d sepro robotique
 d0bb80 shl telemedicine international ltd.
+d0be2c cnslink co., ltd.
 d0c1b1 samsung electronics co.,ltd
-d0c282 cisco systems
+d0c282 cisco systems, inc.
+d0cde1 scientech electronics
 d0cf5e energy micro as
-d0d0fd cisco systems
+d0d0fd cisco systems, inc.
 d0d212 k2net co.,ltd.
-d0d286 beckman coulter biomedical k.k.
+d0d286 beckman coulter k.k.
 d0d3fc mios, ltd.
+d0d471 mvtech co., ltd
 d0d6cc wintop
 d0db32 nokia corporation
 d0df9a liteon technology corporation
@@ -16321,11 +16735,15 @@
 d0e40b wearable inc.
 d0e54d pace plc
 d0e782 azurewave technologies, inc.
+d0eb03 zhehua technology limited
 d0eb9e seowoo inc.
 d0f0db ericsson
+d0f27f steadyserv technoligies, llc
 d0f73b helmut mauell gmbh
 d4000d phoenix broadband technologies, llc.
 d40057 mc technologies gmbh
+d40129 broadcom corporation
+d4016d tp-link technologies co.,ltd.
 d4024a delphian systems llc
 d40fb2 applied micro electronics ame bv
 d410cf huanshun network science and technology co., ltd.
@@ -16337,8 +16755,12 @@
 d41e35 toho electronics inc.
 d41f0c tvi vision oy
 d4206d htc corporation
+d4223f lenovo mobile communication technology ltd.
+d42751 infopia co., ltd
 d428b2 iobridge, inc.
+d429ea zimory gmbh
 d42c3d sky light digital limited
+d43a65 igrs engineering lab ltd.
 d43ae9 dongguan ipt industrial co., ltd
 d43d67 carma industries inc.
 d43d7e micro-star int'l co, ltd
@@ -16354,41 +16776,49 @@
 d45ab2 galleon systems
 d45c70 wireless gigabit alliance
 d45d42 nokia corporation
+d464f7 chengdu usee digital technology co., ltd
 d466a8 riedo networks gmbh
 d46cbf goodrich isr
 d46cda csm gmbh
+d46e5c huawei technologies co., ltd
 d46f42 waxess usa inc
-d479c3 cameronet gmbh & co. kg
+d479c3 cameronet gmbh & co. kg
 d47b75 harting electronics gmbh & co. kg
 d4823e argosy technologies, ltd.
 d48564 hewlett-packard company
 d487d8 samsung electronics
 d48890 samsung electronics co.,ltd
-d48cb5 cisco systems
+d48cb5 cisco systems, inc.
 d48faa sogecam industrial, s.a.
 d491af electroacustica general iberica, s.a.
 d493a0 fidelix oy
 d4945a cosmo co., ltd
 d494a1 texas instruments
+d49524 clover network, inc.
 d496df sungjin c&t co.,ltd
 d49a20 apple, inc
 d49c28 jaybird gear llc
 d49c8e university of fukui
 d49e6d wuhan zhongyuan huadian science & technology co.,
-d4a02a cisco systems
+d4a02a cisco systems, inc.
 d4a425 smax technology co., ltd.
+d4a499 inview technology corporation
 d4a928 greenwave reality inc
 d4aaff micro world
+d4ac4e bodi rs, llc
 d4ae52 dell inc
 d4bed9 dell inc
+d4bf2d se controls asia pacific ltd
+d4bf7f upvel
 d4c1fc nokia corporation
 d4c766 acentic gmbh
 d4ca6d routerboard.com
+d4ca6e u-blox ag
 d4cbaf nokia corporation
 d4ceb8 enatel ltd
 d4d184 adb broadband italia
 d4d249 power ethernet
-d4d748 cisco systems
+d4d748 cisco systems, inc.
 d4d898 korea cno tech co., ltd
 d4df57 alpinion medical systems
 d4e32c s. siedle & sohne
@@ -16396,6 +16826,7 @@
 d4e8b2 samsung electronics
 d4ea0e avaya, inc
 d4ec0c harley-davidson motor company
+d4ee07 hiwifi co., ltd.
 d4f027 navetas energy management
 d4f0b4 napco security technologies
 d4f143 iproad.,inc
@@ -16404,14 +16835,18 @@
 d8052e skyviia corporation
 d806d1 honeywell fire system (shanghai) co,. ltd.
 d808f5 arcadia networks co. ltd.
+d809c3 cercacor labs
 d80de3 fxi technologies as
 d8160a nippon electro-sensory devices
 d8182b conti temic microelectronic gmbh
+d819ce telesquare
 d81bfe twinlinx corporation
 d81c14 compacta international, ltd.
-d824bd cisco systems
+d81ede b&w group ltd
+d824bd cisco systems, inc.
 d826b9 guangdong coagent electronics s &t co., ltd.
 d828c9 general electric consumer and industrial
+d82916 ascent communication technology
 d82986 best wish technology ltd
 d82a7e nokia corporation
 d82de1 tricascade inc.
@@ -16425,7 +16860,7 @@
 d857ef samsung electronics
 d85d4c tp-link technologies co.,ltd.
 d85d84 cax soft gmbh
-d867d9 cisco systems
+d867d9 cisco systems, inc.
 d86bf7 nintendo co., ltd.
 d86ce9 sagemcom sas
 d87157 lenovo mobile communication technology ltd.
@@ -16438,12 +16873,14 @@
 d89685 gopro
 d8973b emerson network power embedded power
 d89760 c2 development, inc.
+d89d67 hewlett packard
 d89db9 emegatech international corp.
 d89e3f apple, inc.
 d8a25e apple, inc.
 d8ae90 itibia technologies
 d8af3b hangzhou bigbright integrated communications system co.,ltd
 d8aff1 panasonic appliances company
+d8b02e guangzhou zonerich business machine co., ltd
 d8b12a panasonic mobile communications co., ltd.
 d8b377 htc corporation
 d8b6c1 networkaccountant, inc.
@@ -16472,15 +16909,18 @@
 dc028e zte corporation
 dc05ed nabtesco  corporation
 dc07c1 hangzhou qiyang technology co.,ltd.
-dc0b1a adb broadband spa
+dc0b1a adb broadband italia
 dc0ea1 compal information (kunshan) co., ltd
 dc16a2 medtronic diabetes
 dc175a hitachi high-technologies corporation
 dc1d9f u & b tech
+dc1dd4 microstep-mis spol. s r.o.
 dc1ea3 accensus llc
 dc2008 asd electronics ltd
+dc2a14 shanghai longjing technology co.
 dc2b61 apple, inc.
 dc2b66 infoblock
+dc2bca zera gmbh
 dc2c26 iton technology limited
 dc2e6a hct. co., ltd.
 dc309c say systems limited
@@ -16493,8 +16933,12 @@
 dc4517 motorola mobility, inc.
 dc49c9 casco signal ltd
 dc4ede shinyei technology co., ltd.
+dc5726 power-one
+dc647c c.r.s. iimotion gmbh
+dc6f08 bay storage technology
 dc7144 samsung electro mechanics
-dc7b94 cisco systems
+dc7b94 cisco systems, inc.
+dc825b janus, spol. s r.o.
 dc85de azurewave technologies., inc.
 dc9b1e intercom, inc.
 dc9c52 sapphire technology limited.
@@ -16504,6 +16948,7 @@
 dca7d9 compressor controls corp
 dca8cf new spin golf, llc.
 dca971 intel corporate
+dca989 macandc
 dcb058 burkert werke gmbh
 dcb4c4 microsoft xcg
 dcbf90 huizhou qiaoxing telecommunication industry co.,ltd.
@@ -16520,13 +16965,14 @@
 dce2ac lumens digital optics inc.
 dce71c aug elektronik gmbh
 dcf05d letta teknoloji
-dcf858 lorent networks£¬ inc.
+dcf858 lorent networks, inc.
 dcfad5 strong ges.m.b.h.
 e005c5 tp-link technologies co.,ltd.
 e006e6 hon hai precision ind. co.,ltd.
 e00b28 inovonics
 e00c7f nintendo co., ltd.
 e0143e modoosis inc.
+e01877 fujitsu limited
 e01c41 aerohive networks inc.
 e01cee bravo tech, inc.
 e01d3b cambridge industries(group) co.,ltd
@@ -16547,12 +16993,15 @@
 e05597 emergent vision technologies inc.
 e0589e laerdal medical
 e05b70 innovid, co., ltd.
-e05da6 detlef fink elektronik & softwareentwicklung
-e05fb9 cisco systems
+e05da6 detlef fink elektronik & softwareentwicklung
+e05fb9 cisco systems, inc.
 e061b2 hangzhou zenointel technology co., ltd
 e06290 jinan jovision science & technology co., ltd.
 e064bb digiview s.r.l.
 e06995 pegatron corporation
+e0757d motorola mobility llc
+e07c62 whistle labs, inc.
+e08177 greenbytes, inc.
 e087b1 nata-info ltd.
 e08a7e exponent
 e08fec repotec co., ltd.
@@ -16560,6 +17009,7 @@
 e091f5 netgear
 e09467 intel corporate
 e09579 orthosoft inc, d/b/a zimmer cas
+e09d31 intel corporate
 e09db8 planex communications inc.
 e0a1d7 sfr
 e0a30f pevco
@@ -16567,10 +17017,15 @@
 e0aab0 general vision electronics co. ltd.
 e0abfe orb networks, inc.
 e0ae5e alps electric co,. ltd.
+e0aeed loenk
+e0b7b1 pace plc
 e0b9a5 azurewave
 e0b9ba apple, inc.
 e0bc43 c2 microsystems, inc.
 e0c286 aisai communication technology co., ltd.
+e0c2b7 masimo corporation
+e0c3f3 zte corporation
+e0c6b3 mildef ab
 e0c79d texas instruments
 e0c922 jireh energy tech., ltd.
 e0c97a apple inc
@@ -16578,18 +17033,22 @@
 e0ca94 askey computer
 e0cb1d 
 e0cb4e asustek computer inc.
+e0cec3 askey computer corp
 e0cf2d gemintek corporation
 e0d10a katoudenkikougyousyo co ltd
 e0d7ba texas instruments
+e0d9a2 hippih aps
 e0dadc jvc kenwood corporation
 e0db55 dell inc
 e0e751 nintendo co., ltd.
 e0e8e8 olive telecommunication pvt. ltd
 e0ed1a vastriver technology co., ltd
+e0edc7 shenzhen friendcom technology development co., ltd
 e0ee1b panasonic automotive systems company of america
 e0ef25 lintes technology co., ltd.
 e0f211 digitalwatt
 e0f379 vaddio
+e0f5c6 apple inc
 e0f5ca cheng uei precision industry co.,ltd.
 e0f847 apple, inc.
 e0f9be cloudena corp.
@@ -16597,6 +17056,7 @@
 e41289 topsystem systemhaus gmbh
 e41c4b v2 technology, inc.
 e41f13 ibm corp
+e425e7 apple
 e425e9 color-chip
 e42771 smartlabs
 e42ad3 magneti marelli s.p.a. powertrain
@@ -16615,17 +17075,21 @@
 e44f5f eds elektronik destek san.tic.ltd.sti
 e455ea dedicated computing
 e45614 suttle apparatus
+e457a8 stuart manufacturing, inc.
 e46449 motorola mobility, inc.
 e467ba danish interpretation systems a/s
+e468a3 huawei technologies co.,ltd
 e46c21 messma gmbh
 e47185 securifi ltd
 e4751e getinge sterilization ab
 e477d4 minrray industry co.,ltd
 e47cf9 samsung electronics co., ltd
+e47d5a beijing hanbang technology corp.
 e48399 motorola mobility, inc.
 e48ad5 rf window co., ltd.
 e48b7f apple
 e49069 rockwell automation
+e492e7 gridlink tech. co.,ltd.
 e496ae altographics inc.
 e497f0 shanghai vlc technologies ltd. co.
 e4a5ef tron link electronics co., ltd.
@@ -16647,11 +17111,12 @@
 e4ec10 nokia corporation
 e4eefd mr&d manufacturing
 e4f365 time-o-matic, inc.
+e4f7a1 datafox gmbh
 e4fa1d pad peripheral advanced design inc.
 e4ffdd electron india
 e8039a samsung electronics co.,ltd
 e8040b apple, inc.
-e80462 cisco systems
+e80462 cisco systems, inc.
 e804f3 throughtek co., ltd.
 e8056d nortel networks
 e80688 apple, inc.
@@ -16663,13 +17128,15 @@
 e81324 guangzhou bonsoninfo system co.,ltd
 e82877 tmy co., ltd.
 e828d5 cots technology
+e82aea intel corporate
+e82e24 out of the fog research llc
 e83935 hewlett packard
 e839df askey computer
 e83a97 ocz technology group
 e83eb6 rim
 e83efb geodesic ltd.
-e83efc arris group, inc
-e84040 cisco systems
+e83efc arris group, inc.
+e84040 cisco systems, inc.
 e840f2 pegatron corporation
 e843b6 qnap systems, inc.
 e84e06 edup international (hk) co., ltd
@@ -16688,10 +17155,12 @@
 e8757f firs technologies(shenzhen) co., ltd
 e878a1 beoview intercom doo
 e87af3 s5 tech s.r.l.
-e8892c arris group, inc
+e8892c arris group, inc.
+e88d28 apple
 e88df5 znyx networks, inc.
 e892a4 lg electronics
 e8944c cogent healthcare systems ltd
+e894f6 tp-link technologies co.,ltd.
 e8995a piigab, processinformation i goteborg ab
 e899c4 htc corporation
 e89a8f quanta computer inc.
@@ -16701,17 +17170,19 @@
 e8a4c1 deep sea electronics plc
 e8abfa shenzhen reecam tech.ltd.
 e8b4ae shenzhen c&d electronics co.,ltd
-e8b748 cisco systems
-e8ba70 cisco systems
+e8b748 cisco systems, inc.
+e8ba70 cisco systems, inc.
 e8be81 sagemcom
 e8c229 h-displays (msc) bhd
 e8c320 austco communication systems pty ltd
 e8cba1 nokia corporation
 e8cc32 micronet  ltd
+e8cd2d huawei technologies co., ltd
 e8d0fa mks instruments deutschland gmbh
 e8d483 ultimate europe transportation equipment gmbh
 e8da96 zhuhai tianrui electrical power tech. co., ltd.
 e8daaa videohome technology corp.
+e8de27 tp-link technologies co.,ltd.
 e8dff2 prf co., ltd.
 e8e08f gravotech marking sas
 e8e0b7 toshiba
@@ -16719,6 +17190,7 @@
 e8e5d6 samsung electronics co.,ltd
 e8e732 alcatel-lucent
 e8e776 shenzhen kootion technology co., ltd
+e8e875 is5 communications inc.
 e8f1b0 sagemcom sas
 e8f928 rftech srl
 ec0ed6 itech instruments sas
@@ -16728,14 +17200,17 @@
 ec1a59 belkin international inc.
 ec233d huawei technologies co., ltd
 ec2368 intellivoice co.,ltd.
-ec3091 cisco systems
+ec2c49 university of tokyo
+ec3091 cisco systems, inc.
+ec3586 apple`
 ec3bf0 novelsat
 ec3f05 institute 706, the second academy china aerospace science & industry corp
 ec42f0 adl embedded solutions, inc.
 ec43e6 awcer ltd.
-ec4476 cisco systems
+ec43f6 zyxel communications corporation
+ec4476 cisco systems, inc.
 ec4644 ttk sas
-ec4670 meinberg funkuhren gmbh & co. kg
+ec4670 meinberg funkuhren gmbh & co. kg
 ec473c redwire, llc
 ec4993 qihan technology co., ltd
 ec4c4d zao npk rotek
@@ -16744,7 +17219,7 @@
 ec5c69 mitsubishi heavy industries mechatronics systems,ltd.
 ec6264 global411 internet services, llc
 ec63e5 epboard design llc
-ec66d1 b&w group ltd
+ec66d1 b&w group ltd
 ec6c9f chengdu volans technology co.,ltd
 ec7c74 justone technologies co., ltd.
 ec7d9d mei
@@ -16768,9 +17243,10 @@
 ecbbae digivoice tecnologia em eletronica ltda
 ecbd09 fusion electronics ltd
 ecc38a accuenergy (canada) inc
-ecc882 cisco systems
+ecc882 cisco systems, inc.
 eccd6d allied telesis, inc.
 ecd00e miraerecognition co., ltd.
+ecd040 gea farm technologies gmbh
 ecd19a zhuhai liming industries co., ltd
 ecd925 rami
 ecd950 irt sa
@@ -16785,7 +17261,7 @@
 ecf00e abocom
 ecf236 neomontana electronics
 ecfaaa the ims company
-ecfc55 a. eberle gmbh & co. kg
+ecfc55 a. eberle gmbh & co. kg
 ecfe7e blueradios, inc.
 f0007f janz - contadores de energia, sa
 f0022b chrontel
@@ -16794,9 +17270,12 @@
 f008f1 samsung electronics co.,ltd
 f013c3 shenzhen fenda technology co., ltd
 f01c13 lg electronics
+f0219d cal-comp electronics & communications company ltd.
+f02329 showa denki co.,ltd.
 f02408 talaris (sweden) ab
-f02572 cisco systems
+f02572 cisco systems, inc.
 f0264c dr. sigrist ag
+f02929 cisco
 f02a61 waldo networks, inc.
 f02fd8 bi2-vision
 f03a55 omega elektronik as
@@ -16807,17 +17286,23 @@
 f04da2 dell inc.
 f04f7c 
 f05849 careview communications
+f05a09 samsung electronics co.,ltd
 f05d89 dycon limited
+f05dc8 duracell powermat
 f05f5a getriebebau nord gmbh and co. kg
 f0620d shenzhen egreat tech corp.,ltd
 f06281 procurve networking by hp
 f065dd primax electronics ltd.
 f06853 integrated corporation
+f06bca samsung electronics co.,ltd
 f073ae peak-system technik
+f07765 sourcefire, inc
 f077d0 xcellen
 f07bcb hon hai precision ind. co.,ltd.
 f07d68 d-link corporation
+f07f0c leopold kostal gmbh &co. kg
 f081af irz automation technologies ltd
+f084c9 zte corporation
 f08bfe costel.,co.ltd
 f0933a nxtconect
 f093c5 garland technology
@@ -16847,24 +17332,28 @@
 f0de71 shanghai edo technologies co.,ltd.
 f0deb9 shanghai y&y electronics co., ltd
 f0def1 wistron infocomm (kunshan)co
-f0e5c3 draegerwerk ag & co. kg aa
+f0e5c3 drägerwerk ag & co. kg aa
 f0e77e samsung electronics co.,ltd
 f0ec39 essec
 f0ed1e bilkon bilgisayar kontrollu cih. im.ltd.
 f0eebb vipar gmbh
 f0f002 hon hai precision ind. co.,ltd.
+f0f260 mobitec ab
 f0f644 whitesky science & technology co.,ltd.
-f0f755 cisco systems
+f0f669 motion analysis corporation
+f0f755 cisco systems, inc.
 f0f7b3 phorm
 f0f842 keebox, inc.
-f0f9f7 ies gmbh & co. kg
+f0f9f7 ies gmbh & co. kg
 f0fda0 acurix networks lp
 f40321 benext b.v.
 f4044c valencetech limited
 f40b93 research in motion
 f40f9b wavelink
+f41ba1 apple
 f41e26 simon-kaloi engineering
 f41f0b yamabishi corporation
+f41fc2 cisco
 f436e1 abilis systems sarl
 f43814 shanghai howell electronic co.,ltd
 f43d80 fag industrial services gmbh
@@ -16882,6 +17371,7 @@
 f45595 hengbao corporation ltd.
 f4559c huawei technologies co., ltd
 f455e0 niceway cnc technology co.,ltd.hunan province
+f45842 boxx tv ltd
 f45fd4 cisco spvtg
 f45ff7 dq technology inc.
 f4600d panoptic technology, inc
@@ -16891,18 +17381,23 @@
 f473ca conversion sound inc.
 f47626 viltechmeda uab
 f47acc solidfire, inc.
-f47f35 cisco systems
+f47b5e samsung eletronics co., ltd
+f47f35 cisco systems, inc.
 f48771 infoblox
 f48e09 nokia corporation
 f490ea deciso b.v.
 f49461 nexgen storage
 f49466 countmax,  ltd
+f499ac weber schraubautomaten gmbh
 f49f54 samsung electronics
 f4a52a hawa technologies inc
-f4acc1 cisco systems
+f4acc1 cisco systems, inc.
 f4b164 lightning telecommunications technology co. ltd
+f4b381 windowmaster a/s
 f4b549 yeastar technology co., ltd.
 f4b72a time interconnect ltd
+f4b7e2 hon hai precision ind. co.,ltd.
+f4c6d7 blackned gmbh
 f4c714 huawei device co., ltd
 f4c795 wey elektronik ag
 f4cae5 freebox sa
@@ -16912,14 +17407,17 @@
 f4dcda zhuhai jiahe communication technology co., limited
 f4e142 delta elektronika bv
 f4e6d7 solar power technologies, inc.
-f4ea67 cisco systems
+f4ea67 cisco systems, inc.
 f4ec38 tp-link technologies co., ltd.
+f4f15a apple
 f4fc32 texas instruments
+f80113 huawei technologies co., ltd
 f80332 khomp
 f8051c drs imaging and targeting solutions
 f80bbe motorola mobility, inc.
 f80bd0 datang telecom communication terminal (tianjin) co., ltd.
 f80cf3 lg electronics
+f80dea zycast technology inc.
 f80f41 wistron infocomm(zhongshan) corporation
 f80f84 natural security sas
 f81037 atopia systems, lp
@@ -16927,7 +17425,9 @@
 f81d93 longdhua(beijing) controls technology co.,ltd
 f81edf apple, inc
 f82285 cypress technology co., ltd.
+f82edb rtw gmbh & co. kg
 f82f5b egauge systems llc
+f82fa8 hon hai precision ind. co.,ltd.
 f83094 alcatel-lucent telecom limited
 f8313e endeavour gmbh
 f83376 good mind innovation co., ltd.
@@ -16939,7 +17439,7 @@
 f85063 verathon
 f852df vnl europe ab
 f85f2a nokia corporation
-f866f2 cisco systems
+f866f2 cisco systems, inc.
 f86971 seibu electric co.,
 f86ecf arcx inc
 f871fe the goldman sachs group, inc.
@@ -16972,13 +17472,15 @@
 f8d462 pumatronix equipamentos eletronicos ltda.
 f8d756 simm tronic limited
 f8d7bf rev ritter gmbh
+f8dadf ecotech, inc.
 f8dae2 beta lasermike
 f8daf4 taishan online technology co., ltd.
 f8db4c pny technologies, inc.
 f8db7f htc corporation
 f8dc7a variscite ltd
+f8dfa8 zte corporation
 f8e4fb actiontec electronics, inc
-f8e7b5 utech engenharia e automaçao ltda
+f8e7b5 µtech engenharia e automação ltda
 f8e968 egker kft.
 f8ea0a dipl.-math. michael rauch
 f8eda5 arris group, inc.
@@ -16989,30 +17491,37 @@
 f8f7ff syn-tech systems inc
 f8fb2f santur corporation
 f8fe5c reciprocal labs corp
+f8fea8 technico japan corporation
 fc0012 toshiba samsung storage technolgoy korea corporation
 fc01cd fundacion tekniker
+fc0647 cortland research, llc
 fc0877 prentke romich company
 fc0a81 motorola solutions inc.
 fc0fe6 sony computer entertainment inc.
 fc10bd control sistematizado s.a.
+fc1186 logic3 plc
 fc1794 intercreative co., ltd
 fc1d59 i smart cities hk ltd
 fc1f19 samsung electro-mechanics co., ltd.
 fc1fc0 eurecam
+fc229c han kyung i net co.,ltd.
 fc253f apple, inc.
-fc2a54 connected data
+fc2a54 connected data, inc.
 fc2e2d lorom industrial co.ltd.
 fc2f40 calxeda, inc.
 fc3598 favite inc.
 fc4463 universal audio
+fc4499 swarco lea d.o.o.
 fc455f jiangxi shanshui optoelectronic technology co.,ltd
 fc48ef huawei technologies co.,ltd
 fc4dd4 universal global scientific industrial co., ltd.
 fc5090 simex sp. z o.o.
 fc52ce control id
+fc58fa shen zhen shi xin zhong xin technology co.,ltd.
 fc5b24 weibel scientific a/s
 fc5b26 mikrobits
 fc6198 nec personal products, ltd
+fc626e beijing mdc telecom
 fc683e directed perception, inc
 fc6c31 lxinstruments gmbh
 fc7516 d-link international
@@ -17020,14 +17529,17 @@
 fc7ce7 fci usa llc
 fc8329 trei technics
 fc8399 avaya, inc
+fc8b97 shenzhen gongjin electronics co.,ltd
 fc8e7e pace plc
 fc8fc4 intelligent technology inc.
 fc946c ubivelox
 fc94e3 technicolor usa inc.
 fc9947 cisco
+fc9fae fidus systems inc
 fca13e samsung electronics
 fca841 avaya, inc
 fca9b0 miartech (shanghai),inc.
+fcad0f qts networks
 fcaf6a conemtech ab
 fcc23d atmel corporation
 fcc734 samsung electronics co.,ltd
@@ -17037,6 +17549,8 @@
 fcd4f2 the coca cola company
 fcd4f6 messana air.ray conditioning s.r.l.
 fcd6bd robert bosch gmbh
+fcdb96 enervalley co., ltd
+fcdd55 shenzhen wewins wireless co.,ltd
 fce192 sichuan jinwangtong electronic science&technology co,.ltd
 fce23f clay paky spa
 fce557 nokia corporation
@@ -17046,4 +17560,4 @@
 fcf528 zyxel communications corporation
 fcf8ae intel corporate
 fcfaf7 shanghai baud data communication co.,ltd.
-fcfbfb cisco systems
+fcfbfb cisco systems, inc.
--- /lib/pci	Thu Nov  1 18:56:40 2012
+++ /lib/pci	Fri Mar  1 01:38:06 2013
@@ -24,7 +24,7 @@
 ; Updated and currently maintained by:
 ; Kavi Corporation (admin@pcidatabase.com)
 ;
-; This header created on Thu Nov  1 10:55:24 PDT 2012
+; This header created on Thu Feb 28 16:36:46 PST 2013
 ;---------------------------------------------------------------------------
 ;
 ; This text file is formatted as follows:
@@ -61,6 +61,7 @@
 	00D1	mx98715/25 i740 PCI
 0070	Hauppauge Computer Works Inc.
 	6800	PCI\VEN_14F1&DEV_8810&REV_05 Hauppage Nova -TD-500 DVB-T Tuner Device
+	68001	PCI\VEN_14F1&DEV_8810&REV_05 Hauppage Nova -TD-500 DVB-T Tuner Device
 0100	USBPDO-8
 0123	General Dynamics
 0315	SK - Electronics Co., Ltd.
@@ -68,13 +69,14 @@
 	5606	? ?
 	9665	0009     ZCT8YBT
 046D	Logitech Inc.
-	0805	n.a. n.a.
+	0805	atom ıntel ınsıde n.a.
 	0808	n/a Logitech Webcam C600
 	0809	Unknown Webcam Pro 9000
 	0896	5&34B666AE&0&7 Camera
 	08AD	N/A Quickcam Communicate STX
 	08AF	- -
 	08b2	123abc logitech QuickCam® Pro 4000
+	08f0	n/a n/a
 	08F6	0100 QuickCam Communicate
 	092F	QuickCam Express model number: V-UAP9
 	0A0B	A-00008 Logitech ClearChat Pro USB
@@ -91,13 +93,14 @@
 	C512	n/a n/a
 	C526	n/a n/a
 	C52A	Dell Wireless Keyboard w/ mouse HID Keyboard Device
+	C52B	N/A N/A
 0483	UPEK
 	2016	UPEK fingerprint sensors  Driver Windows XP
 04A9	Canon
 04B3	IBM
 	24D5	PCI\VEN_8086&DEV_293E&SUBSYS_20F217AA&REV_03\3&B1B Audio Controller
 	401		8086 PCI\VEN_8086&DEV_293E&SUBSYS_20F217AA&REV_03\3&B1BFB68&0&D8	
-	401	24D5 PCI\VEN_8086&DEV_293E&SUBSYS_20F217AA&REV_03\3&B1BFB68&0&D8
+	401	24D5 PCI\VEN_8086&DEV_27DA&CC_0C05
 	4010	CC_040100 PCI\VEN_8086&DEV_293E&SUBSYS_20F217AA&REV_03\3&B1BFB68&0&D8
 	9876	CC_040100 PCI\VEN_8086&DEV_293E&SUBSYS_20F217AA&REV_03\3&B1BFB68&0&D8
 04D9	Filco
@@ -116,6 +119,7 @@
 	6366	Unknown Multi Flash Reader USB Device
 	6387	3F83C15F Transcend JetFlash Flash Drive
 	9254	AU9254A21-HAS http://www.alldatasheet.com/datasheet-pdf/pdf/91600/ETC/AU9254A21.html
+	9540	Unknown SmartCard Reader
 0590	Omron Corp
 	0028	HEM-790IT hid device class blood pressure monitor
 05ac	Apple, Inc.
@@ -134,8 +138,8 @@
 	c108	dont know its a webcam software
 	d101	SuYin Web Cam
 067B	Prolific Technology Inc.
-	2303	2506 USB 2 Serial controller
-	2305	PL-2305 USB-to-Printer Bridge Controller
+	2303	2506 Prolific USB 2 Serial Comm Port controller
+	2305	PL-2303 USB-to-Printer Bridge Controller
 	2393	prolific prolific
 	2506	PL-2506 Hi-Speed USB to IDE Bridge Controller
 	25a1	PL-25A1 Prolific PCLinq3 USB Transfer Cable Driver
@@ -224,14 +228,15 @@
 0c45	Microdia Ltd.
 	0C45	USB\VID_0C45&PID_602C\6&E653CF0B&0&2 USB2.0 webcam
 	1111	USB\VID_0C45&PID_612A\5&B0F4C74&0&2 USB webcam
-	6007	USB\VIC_0C45&PID_6007\5&34F1B36C&0&1 USB Camera
+	6007	USB\VID_0C45&PID_6007&REV_0101 Genius WebCam Eye
 	602C	SN9C102C Webcam
 	602D	USB\VID_0C45&PID_608F&REV_0101&MI_01 USB Webcam
 	6030	USB\VID_0C45&PID_6030\5&18D8BE1C&0&1 USB WebCam 
-	610C	USB\VID_0C45&PID_610C\5&386F8B05&0&2 usb web camera - Deluxe
+	610C	USB\VID_0C45&PID_610B\7&3211544E$0$2 usb web camera 
 	6128	USB\VID_0C45&PID_613C&REV_0101 USB WebCam
+	6128_	USB\VID_0C45&PID_6148&REV_0101 USB PC Camera Plus
 	6129	USB\VID_0C45&PID_6029\5&ff9bdde&0&2 USB WebCam
-	6130	USB\VID_0000&PID_0000\5&FF9BDDE&0&2  USB CAMERA
+	6130	USB\VID_0000&PID_0000\5&200E9ECA&0&1 USB CAMERA
 	613A	USB\VID_0C45&PID_613A\5&420082B&0&1 USB WEBCAM
 	613c	USB\VID_0C45&PID_613B&REV_0101   USB Webcam
 	613E	5&29957435&0&1 USB Camera
@@ -243,6 +248,7 @@
 	62B3	USB\Vid_0c45&Pid_62b3&Rev_0100&MI_00 USB 2.0 PC Camera
 	62BF	USB\Vid_0c45&Pid_62bf USB\Vid_0c45&Pid_62bf&Rev_0100
 	62c0	SNP2UVC Sonix Wecam
+	6353	USB\VID_0000&PID_0000\5&21F6DCD1&0&5 USB Microscope
 	641D	USB\VID_0C45&PID_643d 1.3 MPixel Integrated Webcam used in Dell N5010 series
 	6421	USB\VID_0C45&PID_6421&REV_0224&MI_00 USB 2.0 Webcam
 	6489	0x6489 Integrated Webcam Universal Serial Bus controllers
@@ -250,9 +256,10 @@
 	9876	USB\VID_090C&PID_B371&MI_00\6&462987E&0&0000 webcam
 0cf3	TP-Link
 	1002	Wireless USB 2.0 adapter TL-WN821N  Wireless USB 2.0 adapter TL-WN821N
-	3000	unknown (fujitsu lifebook) unknown device
+	3000	неизвес& неизвестное уст&
 	3002	unknown unkown
 	3002_	unknown unknown
+	3005	AR3011 Atheros Bluetooth Module
 	9271	0x0108 TP-LINK 150 Mbps Wireless Lite N Adapter TL-WN721N
 0D2E	Feedback Instruments Ltd.
 0D8C	C-Media Electronics, Inc.
@@ -273,7 +280,7 @@
 	0508	Neteligent 4/16 TR PCI UTP/STP Controller
 	1000	Triflex Model 1000 Pentium Bridge
 	2000	Triflex Model 2000 Pentium Bridge
-	3032	QVision 1280/p v0 GUI Accelerator
+	3032	GUI Accelerator
 	3033	QVision 1280/p v1 GUI Accelerator
 	3034	QVision 1280/p v2 GUI Accelerator
 	4000	Triflex Model 4000 Pentium Bridge
@@ -332,6 +339,7 @@
 	F700	LP7000 Compaq/Emulex Fibre Channel HBA
 	F800	LP8000 Compaq/Emulex Fibre Channel HBA
 0E8D	MediaTek Inc.
+	0002	- -
 	0003	- -
 1000	LSI Logic
 	0001	LSI53C810 PCI-SCSI I/O Processor
@@ -355,7 +363,7 @@
 	0032	LSI53C1035 PCI-X to Ultra320 SCSI Controller
 	0035	LSI53C1035 PCI-X SCSI Controller
 	0040	LSI53C1035 PCI-X to Ultra320 SCSI Controller
-	0050	LSISAS1064 PCI-X Fusion-MPT SAS
+	0050	LSISAS1068E LSISAS1068E / LSI SAS 6i RAID Controller
 	0054	LSISAS1068 PCI-X Fusion-MPT SAS
 	0056	LSISAS1064ET PCI-Express Fusion-MPT SAS
 	0058	LSISAS1068E PCI-Express Fusion-MPT SAS
@@ -385,6 +393,7 @@
 	1001	53C895 Symbios Ultra2 SCSI controller
 	1010	LSI 53C102000 Single channel SCSI controller
 	1020	LSI53C1020 LSI Logic MegaRAID 320-1 Dell PowerEdge PERC 4/SC
+	1960	6002432 RAID Controller
 	9876	7DB82C.YF.F.3.25 5946504E44383243
 1001	Kolter Electronic - Germany
 	0010	ispLSI1032E PCI 1616, 16 TTL-IN, 16 TTL-OUT
@@ -400,12 +409,15 @@
 	 4370	RV370 ATI RADEON X300/X550/X1050 Series Secondary
 	00000100 (256)	{4D36E968-E325-11CE-BFC1-08002BE10318} {4D36E968-E325-11CE-BFC1-08002BE10318}
 	0002	EMU10K1 Audio Cipset (SB) Livel
+	000D	bhjkh ATI RADEON X1200 серии
 	0180200a 	LXPAY0Y001926158A92000         AMD Athlon(tm) X2 Dual-Core QL-62
+	0300	1002 PCI
 	0B12	R580 ATI Radeon X1900
 	1002	0F2A1787 0F2A1787
 	10024152	RV360 ATI RADEON 9600 Series
 	1043	RV410 ATI MOBILITY/ATI RADEON X700
 	11	0x215r2qzua21 0xbcg62
+	1111	ATI Technologies Inc. / Advanced Micro Devices, In ATI Technologies Inc. 
 	1714	A4-3400 AMD Radeon™ HD 6410D Audio
 	3150	M24 ATI MOBILITY /ATI RADEON X600
 	3151	RV380 ATI FireMV 2400
@@ -424,7 +436,7 @@
 	4147	R300GL ATI FireGL Z1
 	4148	R350 ATI RADEON 9800 SE
 	4149	R350 ATI RADEON 9500
-	4150	RV350 ATI RADEON 9600 Series
+	4150	RV350 ATI RADEON 9600
 	4151	RV350 ATI RADEON 9600 Series
 	4152	RV360 ATI RADEON 9600 Series
 	4153	RV350 ATI RADEON 9550/X1050 Series
@@ -438,7 +450,7 @@
 	4169	R350 ATI RADEON 9500 Secondary
 	4170	RV350 ATI RADEON 9600 Series Secondary
 	4171	RV350 ATI RADEON 9600 Series Secondary
-	4172	RV360 ATI RADEON 9600 Series Secondary
+	4172	REV_00 ATI RADEON 9600 Series Secondary
 	4173	RV350 ATI RADEON 9550/X1050 Series Secondary
 	4174	RV350GL ATI FireGL T2 Secondary
 	4175	RV350 RADEON 9200 pro secundar
@@ -460,18 +472,18 @@
 	4361	ALC665 ATI AC97 REALTEK AUDIO DRIVER
 	4363	SB300 ATI SOUTH BRIDGE SB300 DRIVER
 	4369	IXP 3xx PATA 133 Controller
-	436E	IXP 3xx SATA/Raid controller
+	436E	IXP 3xx ATI 436E Serial ATA Controller
 	4370	SB400 AC'97 Audio Controller
 	4371	IXP SB400 PCI-PCI Bridge
-	4372	IXP SB400 SMBus Controller
+	4372	SMBus Controller SMBus Controller
 	4373	IXP SB400 EHCI USB 2.0 Controller
 	4374	IXP SB400 OHCI USB Controller
 	4375	IXP SB400 OHCI USB Controller
 	4376	SB4xx PATA 133 Controller
 	4377	IXP SB400 PCI-ISA Bridge
 	4378	SB400 AC'97 Modem Controller
-	4379	SB450 SATA/Raid controller--1
-	437A	SB4xx SATA/Raid controller--2
+	4379	SB400 / SB450 (Sil3112) ATI 4379 Serial ATA Controller
+	437A	SB4xx ATI 437A Serial ATA Controller
 	437B	SB450 High Definition Audio Controller 
 	4380&CC_0101	ATI SB600 SATA2
 	4380&CC_0104	ATI SB600 RAID/AHCI Controller
@@ -563,7 +575,7 @@
 	4C59	Mobility 6 Radeon Mobility M6 Series (Also known as ATI R7000 64MB TV PCI)
 	4C5A	Radeon Mobility M6 LZ
 	4C64	Radeon Mobility M9-GL
-	4C66	RV250 MOBILITY FireGL 9000
+	4C66	RV250 ATI MOBILITY RADEON 9000
 	4C6E	0x4C6E ATI FireMV 2400 PCI
 	4D46	ATI mobility128 Rage Mobility 128 AGP 4x
 	4D4C	216l0sasa25 Rage Mobility 128 AGP
@@ -705,6 +717,7 @@
 	5954	RS482 ATI RADEON Xpress 200
 	5955	RS480M ATI RADEON Xpress 200M
 	5960	RV280 Radeon 9200 Pro
+	5960 AGP	A051400005470 PN 1024-RC26-1F-SA
 	5961	RV280 ATI RADEON 9200 se agp
 	5962	RV280 Radeon 9200
 	5964	Radeon 9200 Radeon 9200 SE Series
@@ -721,7 +734,7 @@
 	5A60	SUBSYS_FF311179 Video Controller
 	5A61	RC410 ATI Radeon Xpress 200
 	5A613	RC410 ATI RADEON Xpress Series
-	5A62	RC410M ATI RADEON Xpress Series
+	5A62	http://www.csd.toshiba.com/cgi-bin/tais/support/js ATI RADEON Xpress Серии
 	5A63	RC410 ATI RADEON Xpress Series
 	5b60	RV370 ATI RADEON X300/X550/X1050 Series
 	5b62	RV380x ATI RADEON X600 Series
@@ -729,7 +742,7 @@
 	5B64	RV370GL ATI FireGL V3100
 	5B65	RV370 ATI FireMV 2200
 	5B6O	RV370 ATI RADEON X300/X550/X1050 Series
-	5B70	RV370 ATI RADEON X300/X550/X1050 Series Secondary
+	5B70	RV370 ATI RADEON X300 Series Secondary
 	5B72	RV380x ATI RADEON X600 Series Secondary
 	5B73	RV370 0 SerieATI RADEON X300/X550/X105s Secondary
 	5B74	RV370GL ATI FireGL V3100 Secondary
@@ -769,10 +782,12 @@
 	6738	HD6870 Bart XT
 	6739	Barts (Pro) AMD Radeon HD 6850
 	673E	0x2310 0x1787
-	6741	Whistler AMD Radeon™ HD 6700M/HD 6600M Series 
+	6741	Whistler AMD Radeonâ„¢ HD 6700M/HD 6600M Series 
 	6741_	AMD Radeon HD 7450M (6470M)、6630M、In PCI\VEN_1002&DEV_6741&SUBSYS_21E317AA&REV_00
+	674A	V3900 AMD FirePro V3900 graphics
+	6750	1996 AMD Radeon HD 6570
 	6758	NI AMD Radeon HD 6670
-	6759	- AMD Radeon HD 6570
+	6759	1996 AMD Radeon HD 6570
 	6760	6470M AMD/ATi  Radeon 6470M
 	6779	AMD Radeon HD 6470m AMD Radeon HD 6470m
 	6840	SUBSYS 056A1028
@@ -937,6 +952,7 @@
 	72B1	R580 ATI RADEON X1650 Series Secondary
 	72B3	R580 ATI RADEON X1650 Series Secondary
 	7833	RS350 Radeon 9100 Pro
+	79	unknown, 2200 mhz Campo	Valor Juego de instrucciones	x86, x86-64, MMX, 3DNow!, SSE, SSE2, SSE3
 	791	RS690M ATI Mobility Radeon x1100
 	791a	791A HDMI Audio
 	791E	RS690 ATI RADEON X1200 Series
@@ -946,6 +962,7 @@
 	7941	RS600 ATI RADEON Xpress 1200 Series
 	7942	RS600M ATI RADEON Xpress 1250
 	796E	RS690 ATI RADEON 2100
+	8086	1050 PCI
 	9094	RV730 ATI Radeon HD 4600 Series
 	9400	R600 ATI Radeon HD 2900 XT
 	9401	R600 ATI RADEON HD 2900 XT
@@ -991,7 +1008,7 @@
 	94B4	RV740 ATI Radeon HD 4700 Series
 	94B5	AA38 ATI Radeon HD 4650
 	94C1	RV610-DT (Pro) ATI Radeon HD 2400 XT
-	94C3	RV610-DT (LE) ATI Radeon HD 2400 PRO
+	94C3	RV610-DT (LE) ATI Radeon HD 2400 PRO AGP
 	94C4	RV610LE ATI Radeon HD 2400 PRO AGP
 	94C5	RV610 ATI RADEON HD 2400 LE
 	94C7	RV610 ATI RADEON HD 2350
@@ -1015,7 +1032,7 @@
 	9541	RV710 ATI Radeon Graphics Processor
 	954E	RV710 ATI Radeon Graphics Processor
 	954F	RV710 ATI Radeon HD 4350
-	9552	M92 ATI Mobility Radeon HD 4330 Series
+	9552	M92 ATI Mobility Radeon HD 4330 Серии
 	9553	M92 ATI Mobility Radeon HD 5145
 	9555	M93 ATI Mobility Radeon HD 4500 Series
 	9557	M93 ATI FirePro RG220
@@ -1060,23 +1077,27 @@
 	9644	A4-3400 AMD Radeon™ HD 6410D
 	9647	AMD A6-3420M APU With AMD Radeon HD 6520G стандартный vga гр&#10
 	9648	 9648 AMD Radeon(TM) HD 6480G
+	9649	HD 6480G AMD Radeon(TM) HD 6480G
 	9710	RS880 ATI Radeon HD 4200
 	9711	RS880 ATI Radeon 4100
 	9712	4250 ATI Mobility Radeon HD 4200 Series (ATI Mobility Radeon HD 4250)
-	9713	RS880 ATI Mobility Radeon 4100
+	9713	RS880MC ATI Mobility Radeon 4100
 	9715	RS880 ATI Radeon HD 4250 Graphics
 	9802	AMD E-350 AMD Radeon™ HD 6310 Graphics
 	9803	2411E6FE Display driver http://support1.toshiba-tro.de/tedd-files2/0/display-20110404110958.zip
 	9804	AMD Radeon HD 6310 Graphics  AMD Radeon HD 6310 Gr AMD Radeon HD 6310 Graphics
 	9806	AMD Radeon HD 6320 E-450 APU
 	9807	unknow amd radeon hd 6290 graphic
+	9809	7310M ATI Radeon 7310M
 	9876	ATI GTC (GT-C2U2) ATI 3D Rage Pro AGP 2X
 	9999	(0x9498 ATI Radeon HD 4600
-	AA01	Ati Function driver for high definition audio Ati Mobility Radeon HD HDMI Audio realtek
+	AA01	Ati Function driver for high definition audio1 Ati Mobility Radeon HD HDMI Audio realtek
 	AA08	All with HDMI support High Definition Audio Device
 	AA10	677 HDMI Audio Support
 	AA20	RV630 ATI Radeon HD 3600 Series
 	AA28	3400 Radeon HD 3400 Series
+	aa68	 0x040300  0x00
+	AC12	Theater HD T507 (DVB-T) TV tuner/capture device
 	CAB0	A3/U1 S2K CPU to PCI Bridge
 	CAB1	A3/U1 Slot1 CPU to PCI Bridge
 	cab2	RS200 CPU to PCI Bridge
@@ -1312,8 +1333,8 @@
 1022	Advanced Micro Devices
 	1100	Athlon 64 / Opteron HyperTransport Technology Configuration
 	1101	Athlon 64 / Opteron Address Map
-	1102	Athlon 64 / Opteron DRAM Controller
-	1103	Athlon 64 / Opteron Miscellaneous Control
+	1102	Athlon 64 / Opteron AMD Hammer - DRAM Controller 
+	1103	Athlon 64 / Opteron AMD Hammer - Miscellaneous Control 
 	2000	Am79C970/1/2/3/5/6 PCnet LANCE PCI Ethernet Controller
 	2001	Am79C978 PCnet-Home Networking Ctrlr (1/10 Mbps)
 	2003	Am1772 Wireless LAN chipset SMC 2602W V3 http://www.smc.com/index.cfm?event=downloads.doSearchCriteria&loca
@@ -1380,6 +1401,7 @@
 	756B	AMD-8111 ACPI Controller
 	7801	amd_sata AMD SATA Controller
 	7801_	amd_sata AMD SATA Controller
+	780b	R309218 SM Bus controller
 	7812	amd_sata  AMD USB 3.0 Host Controller
 	840	4u Used to blow up the motherboard.  Highly explosive.  Use at ur own risk
 	9642	AMD-6370D AMD Radeon HD6370D
@@ -1465,7 +1487,7 @@
 	5217	M5217 I/O Controller
 	5219	M5219 I/O Controller
 	5225	M5225 EIDE Controller
-	5229	M5229 EIDE Controller
+	5229	M522 EIDE Controlle
 	5235	1025 I/O Controller
 	5237	M5237 Intel(R) 5 Series/3400 Series Chipset Family 4 Port SATA AHCI Controller - 3B29
 	5239	
@@ -1502,11 +1524,14 @@
 	016d	82541GI Dell PRO/1000 MT Network Connection
 	0287	DELL PERC 320/DC Adaptec 2200S SCSI RAID controller
 	1000	FA82537EP A Intel 537 epg v.92 modem repackaged by dell
+	1050	0200 ethernet controller
 	1f0c	1078 Dell PERC 6/i Integrated RAID Controller
 	3002	AR3011 Dell Wireless 1702 Bluetooth v3.0+HS
-	3582	inspiron 510m video controller
+	3582	inspiron n5110 video controller
+	9876	PowerEdge 3/Si Expandable RAID Controller
 102A	LSI Logic Headland Division
 	0000	HYDRA 4 port usb hub
+	0003	0x0000 USB\VID_0000&PID_0000\5&18BB29D0&1&2
 	0010	ASPEN i486 Chipset
 	102A	HYDRA P5 Chipset
 	9876	HYDRA P5 CHIPSET
@@ -1523,10 +1548,11 @@
 	0520	Matrox lnc MGA-G200B AGP
 	0521	Matrox lnc MGA-G200B 102B
 	0522	G200e Matrox G200e (ServerEngines) - English
-	0525	MGA G450 Dual Head Chip of G450 graphics card
+	0525	i440B Intel Pentium III
 	0527	Parhelia AGP 
 	0528	Parhelia Parhelia 128MB/256MB/PCI/HR256
 	0530	Matrox  G200eV Matrox G200eV
+	0540	M9138 M9138 LP PCIe x16
 	0D10	MGA-I Athena GUI accelerator
 	1000	MGA-G100 Twister
 	1001	MGA-G100 Twister AGP
@@ -1632,7 +1658,7 @@
 	 7012	HDAUDIO\FUNC_01&VEN_&DEV_504514F1&SUBSYS_1631C106& PCI Audio Accelerator
 	0001	HPSiS760 Anthlon 64 cpu to PCI bridge
 	0002	520 Virtual PCI to PCI Bridge (AGP)
-	0003	SiS760 Virtual PCI to PCI Bridge (AGP)
+	0003	SiS760 SiS AGP Controller / SiS Accelerated Graphics Port 
 	0005	0900 Pentium chipset
 	0006	SiS 85C501 PCI/ISA Cache Memory Controller (PCMC)
 	0008	SiS 85C503 PCI System I/O (PSIO)
@@ -1640,7 +1666,7 @@
 	0016	SiS740 SMBus ControllerP4kjc
 	0018	SiS950 vga
 	0160	SiS160 SiS160 811 Wireless LAN Adapter
-	0180	SiS180 Raid Controller(?Mode Raid0)
+	0180	SiS180 SiS 180/181 RAID Controller 
 	0181	? Raid Controller(?Mode Raid1)
 	0182	? Raid Controller(?Mode Raid0+1)
 	0183	?SIS965 ?SATA
@@ -1678,7 +1704,7 @@
 	0658	SiS R658 CPU to PCI Bridge
 	0659	SiS R659 CPU to PCI Bridge
 	0660	vt8237a Host-to-PCI Bridge
-	0661	SiS 661FX CPU to PCI Bridge
+	0661	SiS 661FX SiS 661FX/GX Chipset - Host-PCI Bridge
 	0662	??? CPU to PCI Bridge
 	0663	??? CPU to PCI Bridge
 	0730	SiS 730 Host-to-PCI Bridge
@@ -1693,11 +1719,11 @@
 	0760	SiS760 Athlon 64 CPU to PCI Bridge
 	0761	88e8056 Athlon 64 CPU to PCI Bridge
 	0762	??? Athlon 64 CPU to PCI Bridge
-	0900	SiS 900 sis 900 and integrated lan
+	0900	SiS 900 SiS 900 Fast Ethernet Adapter
 	0901	Device ID = 0900 SiS900 SiS900 10/100 Ethernet Adapter
 	0962	SiS962 LPC Bridge
 	0963	SiS963 PCI to ISA Bridge
-	0964	SiS964 LPC Bridge
+	0964	SiS964 SiS 964 MuTIOL Media I/O Bridge 
 	0999	sis950 pci\ven_1039&subsys_200b163&rev_a0\3&61aaa01\0&17
 	1039	SiS5597a SiS5597 SVGAa
 	1040	
@@ -1715,13 +1741,13 @@
 	5315	SiS530/1/2 GUI Accelerator
 	5401	SiS5401 486 PCI Chipset
 	5511	SiS5511/5512 PCI/ISA System Memory Controller
-	5513	All SIS SouthBridge PATA Controller
+	5513	All SIS SouthBridge SiS 5513 IDE UDMA Controller / SiS 85C513 IDE Controller
 	5517	SiS5517 CPU to PCI Bridge
 	5518	SiS5518 UDMA IDE Controller
 	5571	SiS5571 Memory/PCI bridge
 	5581	SiS 5581 p5 chipset
 	5582	SiS5582 PCI to ISA Bridge
-	5591	MTC ms9377c (SIS 741) PCI /ven_1039
+	5591	MTC ms9377c (SIS 741) PCI\VEN_1969
 	5596	SiS661FX  VGA Controller
 	5597	SiS5597 Host to PCI bridge
 	5600	SiS600 Host-to-PCI Bridge
@@ -1740,16 +1766,16 @@
 	6351	SIS M672 FX SiS IGP Graphics family SIS66x/SIS76x & SIS67x
 	6355	962 962lua
 	6972	
-	7001	 05 USB Host Controller
+	7001	SiS 7001 SiS 7001 PCI to USB Open Host Controller 
 	7002	SiS 7001 PCI to USB Open Host Controller USB 2.0 Enhanced Host Controller
 	7005	SiS551/2 Memory Stick Controller
 	7007	1039 OHCI Compliant FireWire Controller
-	7012	PCI\VEN_1039&DEV_6330&SUBSYS_10041631&REV_00 ONBOARD AUDIO Realtek AC'97
+	7012	SiS 7012 SiS 7012 Audio Device / Realtek AC'97 Audio
 	7013		SiS5597a Smart Link 56K Voice Modem (download from driverguide.com)
 	7013	SiS7013 Smart Link 56K Voice Modem
 	7015	SiS550 dd Software Audio dd
 	7016	SiS191 10/100 Ethernet Adapter
-	7018	SiS7012 AC97(CMI973X) ..AUDIO Drivers
+	7018	SiS7018 Onboard audio
 	7019	SiS550/1/2 Hardware Audio
 	7300	SiS7013 GUI Accelerator+3D
 	7502	649 Realtek HDA Audio Driver.
@@ -1801,7 +1827,7 @@
 	1F1D	USB\VID_03F0&PID_2F1D&REV_0000 3G Broadband device
 	201D	? 3G Broadband device
 	231D	USB\VID_03F0&PID_231D\6&23104BA&0&7 HP Integrated Module with Bluetooth Wireless Technology
-	241D	USB\VID_0000_PID_0000_0000\5&39D01B80&0&4 HP DESKJETF4480
+	241D	USB\VID_0000_PID_0000_0000\5&39D01B80&0&4 HP compaq nx6125
 	2910	E2910A PCI Bus Exerciser
 	292	E2924A PCI Host Interface Adapter
 	2920	Fast Host Interface
@@ -1809,6 +1835,7 @@
 	2925	E2925A 32 bit PCI Bus Exerciser and Analyzer
 	2926	E2926A 64 bit PCI Bus Exerciser and Analyzer
 	2927	E2927a 64 Bit, 66/50MHz PCI Analyzer & Exerciser
+	294	qds brcm1051 pci hostinterface
 	2940	E2940A 64 bit, 66/50MHz CompactPCI Analyzer&Exerciser
 	311d	rev 001 ATHEROS AR3011 bluetooth 3.0+HS adapter
 	3206	unknown Adaptec Embedded Serial ATA HostRAID
@@ -1819,6 +1846,7 @@
 	3302	3305103C Integrated Lights Out 2.0
 	3A1D	hs2340 HP hs2340 HSPA+ MobileBroadband
 	5461	unknown HP integrated Module with Bluetooth 2.0 Wireless support
+	9876	rev 001 ATHEROS AR3011 bluetooth 3.0+HS adapter
 103E	Solliday Engineering
 103F	Logic Modeling
 1041	Computrend
@@ -1888,6 +1916,7 @@
 	1746	STG 1746X 
 	2774	STE10/100A PCI 10/100 Ethernet Controller
 	3520	MPEG-II Video Decoder
+	7108	STi7108 Advanced HD AVC decoder with 3D graphics acceleration
 	CC00	STA2X11 ConneXt I/O Hub multifunction device
 	CC01	STA2X11 ConneXt I/O Hub multifunction device
 	CC02	STA2X11 ConneXt I/O Hub multifunction device
@@ -1923,6 +1952,7 @@
 	0508	TI380PCI PCI interface for TI380 compressors
 	1000	TI PCI Eagle i/f AS 
 	104C	PCI\VEN_8086 PCI Simple Communications Controller
+	3B04	028000 otros dispositivos
 	3D04	TVP4010 Permedia
 	3D07	TVP4020 AGP Permedia 2
 	8000	TSB12LV21 LYNX IEEE1394 FireWire Host Controller
@@ -1939,12 +1969,12 @@
 	8026	TSB43AB21A 1394a-2000 OHCI PHY/Link Layer Ctrlr
 	8027	PCI4451 OHCI-Lynx IEEE 1394 Controller
 	8029	040803-2158 OHCI Compliant IEEE-1394 FireWire Controller
-	802e	PCI7420 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller
+	802e	PCI7420 OHCI Compliant IEEE 1394 Host Controller
 	8033	PCI0021 Integrated FlashMedia 
 	8034	10981734 SDA Standard Compliant SD Host Controller
 	8035	N/A PCI GemCore based SmartCard controller
 	8036	PCI6515 Texas Instruments PCIxxx12 Cardbus Controller
-	8038	PCI\VEN_104C&DEV_8039&SUBSYS_01821028&REV_00\4&2FA Texas Instruments PCI GemCore SmartCard 
+	8038	PCI\VEN_104C&DEV_8038&SUBSYS_01861028&REV_00\4&2FA Texas Instruments PCI GemCore based SmartCard Controller
 	8039	104C 104C
 	803a	PCIxx12 OHCI Compliant IEEE 1394 Host controller
 	803B	PCIxx12 Integrated FlashMedia Controlled Texas Instruments Card Reader
@@ -2005,14 +2035,14 @@
 	AC59	PCI1620 PCCard CardBus Controller w/UltraMedia
 	AC5A	PCI1610 PCCard CardBus Controller w/UltraMedia
 	ac60	  PCI2040 PCI to DSP Bridge
-	ac8e	PCI7420 CardBus Controller
+	ac8e	PCI7420 Generic CardBus Controller 
 	AC8F	7420/7620 FlashMedia
 	B000	TMS320C645x Device ID: 0xB001 
 	B001	TMS320DM642 DSP with a C64x+ core and M/S PCI interface
 	FE00	tsb12lv26 FireWire Host Controller
 	FE03	12C01A FireWire Host Controller
 104D	Sony Corporation
-	5001	SNY5001 Sony Firmware Extension Parser listed as ACPI\SNY5001 in device manager.
+	5001	SNY5001t Sony Firmware Extension Parser listed as ACPI\SNY5001 in device manager.
 	8009	CXD1947 PCI bus 5
 	8039	CXD3222 OHCI i.LINK (IEEE 1394) PCI Host Ctrlr
 	8056	0x127a Rockwell HCF 56K Modem
@@ -2292,7 +2322,7 @@
 	2432	ISP2432 4Gb PCI Single/Dual Fibre Channel HBA
 	2532	ISP2532 8Gb PCIe x8 Single/Dual Fibre Channel HBA
 	3010	n/a n/a
-	3032	n/a QLOGIC Dual Port 1GBPS PCI-E HBA
+	3032	ISP4032 QLOGIC Dual Port 1GBPS PCI-E HBA
 	4000	
 	4010	
 	6312	SP202 Qlogic FC-HBA QLA200
@@ -2452,7 +2482,7 @@
 	0162	PCI-MIO-16XE-50 24MIO  6-03-2
 	1150	PCI-DIO-32HS High Speed Digital I/O Board
 	1170	PCI-MIO-16XE-10 
-	1180	PCI-VEN-1180 base system device
+	1180	PCI-VEN-1180  base system device
 	1190	PCI-MIO-16E-4 
 	11B0	
 	11C0	
@@ -2478,6 +2508,7 @@
 	702C	NI PXI-7831R NI FPGA Modul
 	70af	PCI-6221 16-Bit, 250 kS/s, 16 Analog Inputs
 	70b8	NI PCI-6251 Multifunction DAQ Device
+	70E3	1 NI PXI-8431/8 (RS485/RS422)
 	70E4	70E41093 NI PCI-8430/8 (RS-232) Interface
 	710e	PCIe-GPIB GPIB Controller Interface Board
 	71BC	PCI-6221  16-Bit, 250 kS/s, 16 Analog Inputs  (DSUB37)
@@ -2526,7 +2557,7 @@
 	9876	0x9876 0x9876
 1096	Alacron
 	1106	0x3059 0x47204005&RE
-	3059	VT8235 South Bridge
+	3059	VT8233 South Bridge
 1097	Appian Graphics
 	0038	EIDE Controller (single FIFO)
 1098	Quantum Designs Ltd.
@@ -2544,16 +2575,16 @@
 	0351	Bt848 BrookTree Bt848 Video Capture Device - Audio Section	PCI
 	0369	Bt878fusion 878a Video Capture
 	036C	thık 
-	036E	25878-13 video capture device PINNAcle PCTV/PRO PCI
+	036E	25878-13 AVerMediaAverTV WDM AudioCapture (878)
 	036F	Bt878 Video Capture
 	0370	Bt880B Video Capture (10 bit High qualtiy cap)
-	0878	00000000&REV_11 TV Video Capture: Hauppauge WinTV GO pinnacle PCTV/PRO PCI
+	0878	00000000&REV_11 AVerMediaAverTV WDM AudioCapture (878)
 	0879	Bt879khf Video Capture (Audio Section)
 	0880	Bt880 Video Capture (Audio Section)
 	109E	Brooktree Corp BT848 SVR-2000 V1.02m Multimedia Video Controllerm
 	109E - 0x036E	1822-0001 0400 video devce
 	2115	BtV 2115 BtV Mediastream Controller 9x
-	2125	BtV 2125 BtV Mediastream Controller
+	2125	109 BtV Mediastream Controller
 	2164	BtV 2164 Display Adapter
 	2165	BtV 2165 MediaStream Controller
 	36e	878a 25878-13
@@ -2597,6 +2628,8 @@
 	8002	G-net NT 
 10AB	Digicom
 	1005	USB\VID_0000@PID_0000\6@390392D@0@1 USB Pendrive
+	1007	USB\VID_0000@PID_0000\6@390392D@0@1 usb pendrive
+	8086	2200 PCI Simple Communications Controller 
 10AC	Honeywell IASD
 10AD	Winbond Systems Labs
 	0001	W83769F EIDE Ctrlr
@@ -2627,7 +2660,7 @@
 	3001	plx9030 gpscard
 	5406	PCI RDK9054-LITE PCI Reference Design Kit for PLX PCI 9054
 	5601	PCI 9056 32-bit; 66MHz PCI Bus Master I/O Accelerator, 17 x 17mm FPBGA
-	6520	PCI6520 PCI-X to PCI-X Bridge
+	6520	PCI6520 G PCI-X to PCI-X Bridge
 	6ACC	PCI 9030 General Mechatronics 6 Axis Motion Control Card for EMC2
 	8111	PEX 8311 1 Lane PCI Express to PCI bridge (PEX8111); 1 Lane PCI Express to Generic Local Bus bridge (PEX8311)
 	8112	PEX8112 1 Lane PCI Express to PCI bridge
@@ -2704,7 +2737,7 @@
 	9041	3C905-T4 Fast Etherlink XL 10/100
 	9050	3C905B - Combo Fast Etherlink XL PCI 10/100
 	9051	3C905-T4 Fast Etherlink XL 10/100
-	9055	pnpb006 Fast Etherlink 10/100 PCI TX NIC
+	9055	APCI/pnpb006 Fast Etherlink 10/100 PCI TX NIC
 	9056	3C905B-T4 Fast EtherLink XL 10/100
 	9058	3C905B-COMBO Deluxe EtherLink 10/100 PCI Combo NIC
 	905A	3C905B-FX Fast EtherLink 100 Fiber NIC
@@ -2839,7 +2872,7 @@
 10C6	Rambus Inc.
 10C8	Neomagic Corporation
 	0004	831610F7 MagicGraph 128XD
-	0000	Graphics Cntrlr
+	0000	NM2097 Graphics Cntrlr
 	0003	NM2093 MagicGraph 128ZV Video Controller
 	0004	NM2160 MagicGraph 128XD
 	0005	NM2200 MagicMedia 256AV
@@ -2852,7 +2885,7 @@
 	8016	NM2380 MagicMedia 256XL+ Audio Device
 10C9	Dataexpert Corporation
 10CA	Fujitsu Siemens
-	9876	ROOT\HAJOCAP\0001 The drivers for this device are not installed.
+	9876	ROOT\HAJOCAP\0001 PCI\VEN_8086&DEV_266E&SUBSYS_105A1734&REV_03\3&B1BFB68&0&F2
 10CB	Omron Corporation
 10CD	Advanced System Products
 	1100	ASC1100 PCI SCSI Host Adapter
@@ -2890,7 +2923,7 @@
 	0532	MX98723/727 PCI/CardBus Fast Ethernet Controller
 	0553	MX987x5 Ethernet Adapter
 	8625	MX86250 xiankasqudong
-	8626	MX86251 PCI\VEN_10D9&DEV_8626&SUBSYS_00000000&REV_00\4&1F7DBC9F&0&08F0  
+	8626	MX86251 PCI\VEN_10D9&DEV_8626&SUBSYS_00000000&REV_00\4&1F7DBC9F&0&08F0 
 	8627	MX86251FC Voodoo Rush MX86251
 	8888	MX86250 9619E
 	C115	lc82c115  Linksys LNE100TX 
@@ -2928,6 +2961,7 @@
 	0019	NV3 Riva 128ZX
 	001D	NV35 nVidia GeForce FX 5900XT
 	0020	GTX680M NVIDIA RIVA TNT
+	0028	  		NV05	0DF4  MCP67 
 	0028	0DF4 MCP67 High Definition Audio
 	0029	NV05 NVIDIA RIVA TNT 2 Ultra
 	002A	0df4 TNT2
@@ -3192,7 +3226,7 @@
 	0268	MCP51 NVIDIA nForce Networking Controller
 	0269	MCP51 Ethernet Controller 
 	026B	MCP51 MCP51 AC'97 Audio 
-	026C	MCP51 High Definition Audio Controller
+	026C	MCP51 Realtek HD Audio Driver
 	026e	MCP51 USB Controller (EHCI)  MCP51 USB Controller
 	0271	nForce Coprocessor (nForce System Management Controller) 
 	0280	NV28 NVIDIA GeForce4 Ti 4800
@@ -3248,7 +3282,7 @@
 	0323	NV34 NVIDIA GeForce FX 5200LE
 	0324	NV34 NVIDIA GeForce FX Go 5200
 	0325	NV34 NVIDIA GeForce FX Go 5250/5500
-	0326	NV34 NVIDIA GeForce FX 5500
+	0326	NV34 NVIDIA GeForce GTX 550 Ti
 	0327	NV34 NVIDIA GeForce FX 5100
 	0328	NV34 NVIDIA GeForce FX Go 5200 32/64M
 	0329	NV34 NVIDIA NV34MAP
@@ -3288,12 +3322,13 @@
 	038B	G73 NVIDIA GeForce 7650 GS
 	0390	G73 NVIDIA GeForce 7650 GS
 	0391	G73 NVIDIA GeForce 7600 GT
-	0392	G73 NVIDIA GeForce 7600 GS
+	0392	GS NVIDIA GeForce 7600 GS
 	0393	G73 NVIDIA GeForce 7300 GT
 	0394	G73 NVIDIA GeForce 7600 LE
 	0395	G73 NVIDIA GeForce 7300 GT
 	0398	G70 NVIDIA GeForce Go 7600
 	039E	G73 NVIDIA Quadro FX 560
+	039F	SUBSYS_00000000 REV_A1\4&1B41B794&0&00E0
 	03D0	MCP61 NVIDIA Graphic driver for XP32
 	03D1	C61 nForce 520 LE
 	03D2	C61 NVIDIA GeForce 6100 nForce 400
@@ -3307,7 +3342,7 @@
 	03EC	MCP61 MCP61 PATA Controller
 	03EF	nForce 405, MCP61 Ethernet Nvidia Networking Card
 	03EF &	MCP51 & MCP61 GeForce 6100
-	03F0	MCP51 & MCP61 GeForce 6100
+	03F0	ALC660/ALC662 Realtek High Defnition Audio getarnt als nVidia MCP
 	03F1	MCP61 USB Controller Serial bus controller
 	03F2	MCP61 USB Controller Serial bus controller
 	03F3	MCP61 PCI bridge Bridge
@@ -3349,6 +3384,7 @@
 	044F	MCP65 MCP65 ?AHCI
 	0450	E0001458 A3
 	045D	MCP65 MCP65 SATA Controller(IDE mode)
+	0523	NVidia GeForce 9400GT GPU
 	0531	7150 NVIDIA GeForce Go 7150M (UMA)
 	0533	-PCI\VEN 10DEV 0533&SUBSYS 30EA103C&REV A2\3&2411E nVidia GeForce 7000M / nForce 610M
 	053A	C68 NVIDIA GeForce 7050 PV / NVIDIA nForce 630a
@@ -3475,7 +3511,7 @@
 	084D	C77 NVIDIA nForce 750a SLI
 	084F	C77 NVIDIA GeForce 8100 / nForce 720a
 	0860	C79 NVIDIA GeForce 9300
-	0861	C79 NVIDIA GeForce 9400
+	0861	1002 NVIDIA GeForce 9400
 	0863	C79 NVIDIA GeForce 9400M
 	0864	C79 NVIDIA GeForce 9300
 	0865	C79 NVIDIA GeForce 9300
@@ -3504,7 +3540,7 @@
 	0A74	GeForce G210M GPU
 	0A75	GF300M GeForce 310M
 	0aa3	MCP7A nForce 730i SMBus Controller
-	0AB0	NForce 9300 ID0A80
+	0AB0	NForce 9300 LAN/SATA/SMBUS/SMU/GPU 0x0A80
 	0AB8	MCP79 MCP79 AHCI1
 	0AB9	MCP79 MCP79 AHCI2
 	0ABC	MCP79 MCP79 RAID1
@@ -3518,25 +3554,29 @@
 	0CA3	GT240 GeForce GT 240
 	0DCD	GT555M Nvidia GeForce GT555M
 	0DD1	GF106M Geforce GTX 460M
+	0DE1	GF108 NVIDIA GeForce GT 430
+	0DE3	GF116 nVidia GT 635M
 	0DF5	164A10CF NVIDIA GeForce GT 525M [VISTA,WIN7/64bits]
+	0DF8	GF108 Quadro 600 rev a1
 	0DFA	1000M Nvidia Quadro 1000M
 	0E22	GTX 460 GTX 460
 	1040	GT520 Nvidia GeForce GT520
 	1050	GT540M Nvidia GeForce GT540M
 	1051	GT520 GeForce GT520 MX
-	1054	GeForce 410M Vvideo Card
+	1054	GeForce 410M Vvideo Карты
 	1056	NVidia NVS 4200m NVidia NVS 4200m
 	1058	NV34 Riva128
 	1086	GF110 GTX 570
 	10C3	GT218 NVIDIA GeForce 8400GS
 	10DE	NV34 Riva 128
+	10de3	nv34 riva 128
 	10DEbis	GFORCE 410 GFORCE 410
 	10F0	82578DC (NV3) INTEL 
 	110	nv11 geforcemx/mx400
 	1112	0x1112 Gateway Solo 9550 NVIDIA Geforce 2 GO 32 MB
 	1200	GF114 560 GTX TI
 	1201	GF114 NVIDIA GeForce GTX 560
-	1244	unknown GeForce  GTX 550
+	1244	NVIDIA Corporation GeForce  GTX 550
 	1251	GF116 (GTX 560m) Nvidia Geforce GTX 560m (MXM 3.0b)
 	135m	220gt navidia quadro nvs135m
 	161	NV44 GeForce 6200 TurboCache
@@ -3546,6 +3586,7 @@
 	26C	6150 AMD
 	45682	123456 need
 	4569	<SCRIPT>alert( <SCRIPT>document.location='http://www.pcidatabase.com/search.php?title=%3Cmeta%20http-equiv=%22refre
+	5209	0x10E6 C-Media Audio Controller
 	69	nVidia MCP2T nVidia MCP2T in MSI MEGA 180
 	8001	MCP73 nVidia MCP73 HDMI Audio Driver
 	9490	OSx 10.6.7 4670 ati radeon hd eah4670/di/1gd3/a
@@ -3553,6 +3594,7 @@
 	DC4	GTS 450 NVIDIA GeForce GTS 450
 	DF5	GT525M Nvidia GeForce GT525M
 	DF5a	GT525M Nvidia GeForce GT525M
+	ODE9	GT 630M Geforce GT 630M
 	_026C	nVidia Geforce 6150 GPU ( Built-Into Controller ) Nvidia Motherboard nForce 430 ( MCP-51 ) with On-Board GeForce 6150 GPU
 10DF	Emulex Corporation
 	10DF	Light Pulse Fibre Channel Adapter
@@ -3628,51 +3670,57 @@
 	 8136	Realtek AC97Audio drivers Realtek 171 High Definition Audio
 	0062	LSISAS1078 PCI-Express Fusion-MPT SAS
 	0185	802.11b Realtek 8180 Extensible 802.11b Wireless Device
-	0260	Realtek ALC260 High Definition Audio HDAUDIO\FUNC_01&VEN_10EC&DEV_0260&SUBSYS_103C3011&REV_1004\4&3B03947C&0&0001
+	0200	RTL8102E Realtek 10/100/1000 PCI-E NIC Family
+	0260	Realtek ALC260 High Definition Audio VEN_10EC&DEV_0260
 	0262	Realtek ALC 262 Realtek ALC 262 Audio
 	0268	High Definition Audio Codecs High Definition Audio Codecs
 	0269	ALC269 Realtek High Definition audio
-	0270	? Realtek High Definition Audio 
+	0270	0270 Realtek High Definition Audio 
 	0272	ALC272X Realtek High Definition audio
 	0532	RTL8723AE BT combo mini pcie card
 	0660	HDAUDIO\FUNC_01&VEN_10EC&DEV_0660&SUBSYS_10191386& HD Audio
-	0662	Realtek AC97Audio  Realtek 171 High De
+	0662	ALC662 5.1 Channel Audio Codec
 	0861	ALC862 Realtek ALC861 High Defintion Audio
 	0880	1631F603 Realtek 880 High Definition Audio
 	0882	Realtek ALC882/D/M Intel 82801GB ICH7 - High Definition Audio Controller
 	0883	ALC883 Realtek High definition Audio
 	0887	FUNC_01&VEN_10EC&DEV_0887&SUBSYS_1458A002&REV_1002 xHDAUDIO\FUNC_01&VEN_10EC&DEV_0887&SUBSYS_104383BC&REV_1002\4&159EE542&0&0001
-	0888	ALC260 Realtek High Definition Audio
-	0889	1Device Audio GigaByte Technology 82801IB/IR/IH HDAUDIO\FUNC_01&VEN_10EC&DEV_0887&SUBSYS_1025047F&REV_1000\4&4854010&0&0001
+	0888		ALC260 Realtek High Definition Audio
+	0888	ALC660 Realtek High Definition Audio
+	0889	1Device Audio GigaByte Technology 82801IB/IR/IH HDAUDIO\FUNC_01&VEN_10EC&DEV_0662
 	0892	ALC892 7.1+2 Channel HD Audio Codec with Content Protection
 	10B9	M5288 SATA/Raid controller cpi
 	10EC	Realtek AC97Audio Realtek 171 High Definition Audio
+	10ECa	Realtek AC97Audio Realtek 171 High Definition Audio
 	12ec	66 66
 	5208	8185 Realtek RTS5208 Card Reader
 	5209	Realtek Realtek PCIE CardReader
+	5229	RTS5229 PCIE RTS5229 card reader driver for XP/Win7/Win8
 	5288	Realtek USB 2.0 Card Reader card reader
 	5591	MTC ms9377c PCI /ven_1039
 	662	Realtek AC97Audio Realtek 171 High Definition Audio
 	8029	8172 Realtek RTL8191SE Wireless LAN 802.11n PCI-E NIC
+	8039	10EC 10EC
 	8136	RTL8102E Realtek 10/100/1000 PCI-E NIC Family
+	8137	RTL8102E Realtek 10/100/1000 PCI-E NIC Family
 	8139	RTL8139http://pcidatabase.com/update_device.php?__ Realtek RTL8139 Family PCI Fast Ethernet NIC
 	8167	RTL8167 Realtek RTL8169/8110
-	8168	RTL8167 PCIe Gigabit Ethernet Family Controller
+	8168	RTL8168 PCIe Gigabit Ethernet Family Controller
 	8169	8169S Realtek RTL8169\8110 Family Gigabit Ethernet NIC
-	816C	Realtek virtual IPMI PCI\VEN_10EC&DEV_816C&SUBSYS_012310EC
-	8171	8136 Realtek RTL8191SE &#1041;&#1077;&#1089;&#1087;&#1088;&#1086;&#1074;&#1086;&#1076;&#1085;&#1086;&#108
+	816C	Realtek virtual IPMI \10EC\
+	8171	8171 Realtek RTL8191SE &#1041;&#1077;&#1089;&#1087;&#1088;&#1086;&#1074;&#1086;&#1076;&#1085;&#1086;&#108
 	8172	RTL8191SE-VA2 Single-Chip IEEE 802.11b/g/n 1T2R WLAN Controller with PCI Express Interface
 	8174	RTL8188RU Realtek RTL8188RU
-	8176	RTL8188CUS Subsys_818410EC
+	8176	ASUS PCE-N1011n Wireless LAN PCI-E Card Subsys_84B51043
 	8178	PCE-N15 ASUS PCE-N15 Wireless LAN PCI-E Card
 	8180	RTL8180L 802.11b MAC Network controller
 	8185	RTL0185L RTL8185L PCI Wireless adapter
 	8199	RTL8187SE http://www.realtek.com/downloads/downloadsView.aspx?Langid=1&PNid=21&PFid=40&Level=5&Conn=4&DownType
 	8609	Realtek AC97Audio Realtek 171 High Definition Audio
-	8723	. .
+	8723	8723AE Realtek 8191SE Wireless LAN
 	9876	Realtek AC97Audio drivers Realtek 171 High Definition Audio
 	A167	Realtek RTL8110SC-GR Realtek RTL8110SC-GR
-	C139	8029 PCI Device
+	C139	5229 PCI Device
 10ED	Ascii Corporation
 	10DE	SN0730506616 PT ICT FQC
 	7310	V753 VGA Video Overlay Adapter
@@ -3680,6 +3728,7 @@
 	0004	Virtex 4 Virtex 4 FPGA
 	0007	Virtex V Virtex V FPGA
 	0105	Fibre Channel
+	0106	Virtex 5 data compression device
 	0314	Spartan XC2S50E Communications Controller
 	0X1001	8343176 PCI to H.100 audio interface
 	3FC0	RME Digi96 
@@ -3701,7 +3750,7 @@
 	B300	VCL-M graphics board
 10F1	Tyan Computer
 	1566	IDE/SCSI
-	1677	Multimedia
+	1677	http://www.broadcom.com/support/ethernet_nic/netxt Multimedia
 	1A2A	Unknown web cam on toshiba satellite c6555
 	1a34	Unknown Camera
 	2013	RS-56 sp-pci Conexant RS-56 PCI Modem
@@ -3722,7 +3771,7 @@
 	0001	GUI Accelerator
 	0002	GUI Accelerator
 	0003	GUI Accelerator
-	0004	GUI Accelerator
+	0004	2189 GUI Accelerator
 	0005	GUI Accelerator
 	0006	GUI Accelerator
 	0007	GUI Accelerator
@@ -3743,7 +3792,7 @@
 10FB	Thesys Microelectronic's
 	186f	TH6255 
 10FC	I-O Data Device Inc.
-	8139	4020011B 10
+	8139	Chip Description 10
 10FD	Soyo Technology Corp. Ltd.
 	7E50	- -
 10FE	Fast Electronic GmbH
@@ -3768,9 +3817,10 @@
 	0005	EMU20K1, CA20K1 Sound Blaster X-Fi XtremeMusic (SB0460), XtremeGamer OEM (SB0770)
 	0006	emu10k1x Soundblaster Live! 5.1 (SB0200)
 	0007	C6SB0410515017656A Sound Blaster 5.1 vx
-	0008	ca0108 sound blaster Audigy 2 or 4
+	0008	ca0108 sound blaster Audigy 4
 	000A	SB1040 Creative Labs  Sound Blaster X-Fi Xtreme Audio
 	000D	SB0880 PCIe SB X-Fi Titanium Fatal1ty Pro Series
+	0011	SB1500 Sound Blaster Z
 	006	emu10k1x Soundblaster Live! 5.1
 	1017	5803 3D Blaster Banshee PCI CT6760
 	1020	NV5 3D Blaster RIVA TNT2
@@ -3785,6 +3835,7 @@
 	7005	650 Audigy LS Series Game Port
 	7802	EMU1OK1-NGF Environmental Audio (SB  Live)
 	8938	EV1938 Sound
+	9800	EMU10KX Game Port
 	C00D11BA	ca0103-dbq sound  port for SB Live! Series
 	1371	
 1103	 HighPoint Technologies, Inc.
@@ -3838,10 +3889,10 @@
 	0397	VT1708S VIA High Definition Audio
 	0448	0
 	0501	VT8501 Host Bridge
-	0505	3059 3249
+	0505	4397 4397
 	0506	1106 1708
 	0561	82C570 MV IDE Controller
-	0571	VT8237a Bus Master IDE Controller
+	0571	VT8235 / VT8237a Bus Master IDE Controller
 	0576	82C576 P54 Ctrlr
 	0581	CX700 VIA/S3G Unichrome Pro II IGP
 	0585	VT82C585VP/VPX Host Bus-PCI Bridge
@@ -3864,7 +3915,7 @@
 	1006	3059 3249
 	1089	3059 VIA Sound VIA AC97 in VT82C686A/B,VIA AC97 in VT8233/AC,VT8235
 	10jn	1106 3108
-	1106	VT1705 VIA HD Audio Deck VT1708B
+	1106	VT1705 VIA HD Audio Deck vt8235
 	1107	060000A ISA Bridge w/IDE
 	1111	060000A1106 VIA Sound VIA AC97 in VT82C686A/B, VIA AC97 in VT8233/AC, VT8235 & VT8237/R, VIA Vinyl audio VT1612A
 	1204	??? CPU to PCI
@@ -3888,7 +3939,8 @@
 	2259	CN400/PM880 Host Bridge
 	2269	KT880 CPU to PCI Bridge
 	2282	K8T880Pro CPU to PCI Bridge
-	24c5	82801DBM SoundController (ICH4-M B0 step) VIA Vynil v700b
+	24c5	8086 SoundController (ICH4-M B0 step) VIA Vynil v700b
+	3009	SB200 AC'97 Audio Controller
 	3038	VT6212L USB
 	3038*	VT8251 4 x USB1.0 PCI controller
 	3040	VT82C586A/B APM(or ACPIAPIC?)
@@ -3901,9 +3953,10 @@
 	3053	VT6105M Rhine III Management Adapter
 	3057	VT82C686A/B ACPI Power Management Controller
 	3058	VT1709 PCI\VEN_1106&DEV_3059&SUBSYS_81661043&REV_60\3&267A616A&0&8D
-	3059	VT8235 VIA AC97 or VIA Vinyl (or Tremor) Audio VT1612A, VT1613, VT1616/B, VT1617/A, VT1618 - VIA SoundMAX R
-	3065	VT6103 Rhine II PCI Fast Ethernet Controller
-	3068	PCI\VEN_1106&DEV_3068&SUBSYS_4C211543&REV_80\3&61A VIA MC97 controller for AC-Link modems
+	3059	VT8233 VIA Vinyl (or Tremor) Audio VT1612A, VT1613, VT1616/B, VT1617/A, VT1618
+	30590	9739  C-Media Electronics Audio Controller
+	3065	VT6102 / VT6103 &#1063;&#1045;&#1056;&#1045;&#1047; &#1056;&#1077;&#1081;&#1085; II Fast Ethernet &#1040;&#1076;&#10
+	3068	PCI\VEN_1106&DEV_3068&SUBSYS_4C211543&REV_80\3&61A VIA MC'97 Modem Controller
 	3068&CC_0000	VT82C686A/B&VT8231 APM(or ACPI?)
 	3068&CC_0780	VT82C686A/B&VT8231 MC97 MODEM
 	3074	VT8233 PCI to ISA Bridge
@@ -3916,7 +3969,7 @@
 	3104	VT6202 USB 2.0 Enhanced Host Controller
 	3106	VT6105M/LOM Rhine III PCI Fast Ethernet Controller
 	3107	VT8233/A AC97' Enhance Audio Controller PCI to ISA Bridge
-	3108	8380 Via Unichrome S3 VGA - part of a VIA Northbridge  >>  Display Driver
+	3108	8237 VIA/S3G UniChrome Pro IGP (Integrated Video Adapter)
 	3109	VT8233/A AC97' Enhance Audio Controller PCI to ISA Bridge
 	3112	VT8361 CPU to PCI Bridge
 	3113	PCI to PCI Bridge
@@ -3971,7 +4024,7 @@
 	4259	??? CPU to PCI Bridge
 	4269	KT880 CPU to PCI Bridge
 	4282	K8T880Pro CPU to PCI Bridge
-	4397	VT1708S ALC662 Audio Codec
+	4397	VT1708S ALC662 &#1040;&#1091;&#1076;&#1080;&#1086; &#1050;&#1086;&#1076;&#1077;&#1082;
 	5000	3059 VIA Sound VIA AC97 in VT82C686A/B, VIA AC97 in VT8233/AC, VT8235
 	5030	VT82C596 ACPI Power Management Controller
 	5308	PT880 Pro / VT8237 Via I/O APIC Interrupt Controller
@@ -4011,6 +4064,7 @@
 	9876	VT8233/A AC97' Enhance Audio Controller PCI to ISA Bridge
 	A208	PT890 PCI-to-PCI Bridge
 	A238	K8T890 PCI-to-PCI Bridge
+	b01f	castle rock agp8x controll fast ethernet nic
 	B091	VT8633 PCI-to-PCI Bridge (AGP)
 	B099	VT8366/A PCI-to-PCI Bridge (AGP)
 	B101	VT8653 PCI-to-PCI Bridge (AGP)
@@ -4025,7 +4079,7 @@
 	B156	VT8372 PCI-to-PCI Bridge (AGP)
 	B158	VIA Technologies Inc PCI-to-PCI Bridge (AGP)
 	B168	VT8235 PCI-to-PCI Bridge (AGP 2.0/3.0)
-	B188	3200+ PCI-to-PCI Bridge (AGP 2.0/3.0)
+	B188	K8M800/K8N800 VIA CPU to AGP2.0/AGP3.0 Controller
 	B198	546546 PCI-to-PCI Bridge (AGP 2.0/3.0)
 	B213	I/O APIC
 	C208	PT890 PCI-to-PCI Bridge
@@ -4151,7 +4205,7 @@
 	016D	GDT 7x43RN 
 	016E	GDT 7x53RN 
 	016F	GDT 7x63RN 
-	01D6	GDT 4x13RZ 
+	01D6	GDT 4x13RZ GDT 4513RZ
 	01D7	GDT 4x23RZ 
 	01db	GDT8514RZ SCSI Ultra320  1-channel
 	01F6	GDT 8x13RZ 
@@ -4189,12 +4243,14 @@
 	7680	102801ab SIGMATEL STAC 92XX 
 	76A0	102801FF STAC 92XX C-Major HD Audio (Dell Precision M4300 and LAT D630 & D830)
 	76B2	92HD75B3 IDT Audio
+	76D1	IDT IDT High Definition Audio CODEC
 	76D5	0x76D1 IDT 92HD87B1/3
 	76E7	92HDxxx HDAUDIO
 	8018	PES12N3A PCI Express Switch
 	802d	PES16T7 PCI Express Switch PES16T7
 	806e	PES24T6G2  PCI Express Gen2 Switch
-	9876	IDT_Audiov5939 IDT/Sigmae HDl Audio Driver v6.10.5939.0 05/06/2008
+	8086	IDT77201/211 NICStAR ATM Adapter
+	9876	IDT_Audiov5939 IDT/Sigmatel HDl Audio Driver v6.10.5939.0 05/06/2008
 111F	Precision Digital Images
 	4A47	Precision MX Video engine interface
 	5243	Frame Capture Bus Interface
@@ -4224,7 +4280,7 @@
 	0011	028 Ethernet Controller
 	1001	bm05e  BlueTooth Adapter ISSCBTA [Tripper USB Dongle]
 	1131	Philips Semic	1131 AVerTV Hybrid Super 007 M135R
-	1131	7130 01384E42y8
+	1131	7134 01384E42y8
 	1201	PTD3000 VPN IPSEC coprocessor
 	1234	5.1.2600.0 EHCI USB 2.0 Controller
 	1301	PTD3210 SSL Accelerator
@@ -4243,9 +4299,12 @@
 	7145	d145ah ddddf
 	7146	saa7146ah  0X7146
 	7160	Philips SAA7134E, TDA10046 and TDA8275A PCI\VEN_1813&DEV_4000&SUBSYS_000216BE&REV_02
-	7231	Philips 7231/726x-Series Medion DVB-T / S Karte. 
+	7162	idk idk
+	7164	PE9400 ASUS My Cinnema PE9400 PCI-E 1x capture card.
+	7231	Philips 7231/726x-&#1057;&#1077;&#1088;&#1080;&#10 AVerMedia H339 &#1043;&#1080;&#1073;&#1088;&#1080;&#1076;&#1085;&#1099;&#1081; &#1040;&#1085;&#1072;
 	9730	SAA9730 Ethernet controller
 	9876	tw9903  saa7146ah
+	FFFF	FF device
 1132	Mitel Corp.
 1133	Eicon Networks Corporation
 	7711	EiconCard C91 
@@ -4388,7 +4447,7 @@
 	0072	DataFire Micro V 
 	0073	DataFire Micro V 
 	00c8	20F0 Digi Neo 2
-	6001	Avanstar 
+	6001	Avanstar ACPI\VEN_HPQ&DEV_6001
 1150	Thinking Machines Corporation
 1151	JAE Electronics Inc.
 1153	Land Win Electronic Corp
@@ -4486,7 +4545,7 @@
 	6100	Bus/Tag Channel
 	6800	Escon Channel
 	7100	Bus/Tag Channel
-	7800	Escon Channel
+	7800	nvidia harmony Escon Channel
 116B	Connectware Inc
 116C	Intelligent Resources
 116E	Electronics for Imaging
@@ -4506,7 +4565,7 @@
 1177	Silicon Engineering
 1178	Alfa Inc
 	AFA1	Fast Ethernet
-1179	Toshiba corporative
+1179	Toshiba corporation
 	 8136	RTL8101E Realtek 10/100/1000 PCI-E NIC Family
 	0102	toshiba america info systems Trusted Platform Module
 	0103	Extended PCI IDE Controller Type-B
@@ -4517,7 +4576,7 @@
 	0601	0555873412 Toshiba CPU to PCI bridge
 	0602	PCI to ISA Bridge for Notebooks
 	0603	ToPIC95 PCI to CardBus Bridge for Notebooks
-	0604	PCI\VEN_1039&DEV_7502&SUBSYS_12341039&REV_00\3&267 PCI to PCI Bridge for Notebooks
+	0604	PCI\VEN_104C&DEV_803B&SUBSYS_FF021179&REV_00 PCI to PCI Bridge for Notebooks
 	0605	PCI to ISA Bridge for Notebooks
 	0606	PCI to ISA Bridge for Notebooks
 	0609	0322 PCI to PCI Bridge for Notebooks
@@ -4528,11 +4587,11 @@
 	0618	CPU to PCI and PCI to ISA Bridge
 	0701	vt82c693 PCI Communication Device
 	0804	0x0804 Toshiba Smart Media Host Controller
-	0805	ACPI\TOS6205\2&DABA3FF&1 ACPI\TOS6205\2&DABA3FF&1
+	0805	ACPI\TOS6205\2&DABA3FF&2 ACPI\TOS6205\2&DABA3FF&~2
 	0D01	0x0D01 FIR Port Type-O
 	1179	32 Dispositivo de comunicaciones pci
 	13A8	XR17C158/154/152 Multi-channel PCI UART
-	9876	ACPI\TOS1900\2&DABA3FF&1 SD Card Controller
+	9876	ACPI\TOS1901 SD Card Controller
 117A	A-Trend Technology
 117B	LG (Lucky Goldstar) Electronics Inc.
 	8320	NOFM12 USB DEVICE
@@ -4549,17 +4608,18 @@
 	0552	R5C552 FireWire (IEEE 1394) Controller
 	0575	44192 I11fXI  <a href=
 	059	1 1
-	0592	Rl5C592 Rioh Memory Stick Controller
-	05xx	R5U8xx Ricoh R5U8xx Card Reader Driver - Win 7
+	0592	R5C592 Ricoh Memory Stick Controller
+	05xx	R5U8xx Ricoh R5U8xx Card Reader Driver - Win xp
 	0822	R5C832 SDA Standard Compliant SD Host Controller
 	0832	30CF103C IEEE 1394 (4 pin firewire) chip)
-	0843	R5C853 Ricoh SD/Host Controller
+	0843	R5C853 Ricoh SD Host Controller
 	0847	delete delete
 	0852	R5C852 Ricoh xD-Picture Card Controller
 	1108	30CF Ricoh Memory Stick Host Controlle
 	5551	Unknown IEEE 1394 Controller
 	852	01cf1028  Ricoh xD-Picture Card Host Controller;0852h xd picture card controller
 	9876	CC_088000 Ricoh Memory Stick Host Controlle
+	98760x0843	R5C853 Ricoh SD/Host Controller
 	E2030	0592 Ricoh PCIe Memory Stick Host Controller
 	E230	GM45 Chip Number	 Ricoh PCIe Memory Stick Host Controller
 	e476	Ricoh R5C843 Multipurpose chip, this e476 seems to be the CardBus controller part
@@ -4586,6 +4646,7 @@
 	3c09	DWL-G510 Version C1 Ralink RT61
 	4000	DL2000 Gigabit Ethernet Adapter
 	4001	DFE-650TX D Link Fast Ethernet PCMCIA Card
+	4200	DFE-520TX_C1 -
 	4300	dlg10086 Used on DGE-528T Gigabit adaptor
 	4302	dg530t DGE-530T
 	4B01	DGE-530T Gigabit Ethernet Adapter
@@ -4779,6 +4840,7 @@
 	0292	V292PBC Am29030/40 Bridge
 	0500	V340HPC PCI System Ctrlr for 64-bit MIPS CPU
 	0960	V96xPBC i960 Bridges for i960 Processors
+	4750	V3 V962PBC-40LP / VLSI VP06597A SCRAMNet
 	C960	V96DPC i960 Dual PCI Bridge
 11B1	Apricot Computers
 11B2	Eastman Kodak
@@ -4829,7 +4891,7 @@
 	0443	LT Winmodem 1646T00
 	0444	LT Winmodem 845G
 	0445	LT Winmodem 
-	0446	LT Winmodem PCI\VEN_10DE&DEV_0446&SUBSYS_73691462&REV_A1\3&267A616A&0&09
+	0446	NVidia SMBus PCI\VEN_10DE&DEV_0446&SUBSYS_73691462&REV_A1\3&267A616A&0&09
 	0447	LT Winmodem windowsme
 	0448	LT Winmodem 56k SV2P2
 	0449	LT Winmodem 56k 0449144F
@@ -4865,7 +4927,7 @@
 	0620	SV92PP Agere PCI Soft Modem 
 	0630	11c1063011c1 #1: 32 pins, 8 each on 4 sides #2: 20 pins, 10 ea on 2 sides.
 	1040	Prespa Agere Systems HDA Modem
-	11c1	Prespa Agere Systems HDA Modem
+	11c1	ПреÑ�па Agere Systems МоÐ'ем HDA
 	3026	0x11c11040 Agere Modem
 	3055	Modem on Audio Bus Agere Systems HDA Modem v6081
 	4758	210888GX Mach64 GX
@@ -4948,7 +5010,7 @@
 11DC	Questra Corp
 11DD	Crosfield Electronics Ltd
 11DE	Zoran Corporation
-	6057	ZR36067 AV PCI Controller
+	6057	ZR36067 AV PCI Controller  - Pinnacle DC10plus, Motion-JPEG VideoIO Board
 	6067	zr36067pqc zoran
 	6120	ZR36120PQC MPEG VideoBVPSXI Capture Card
 	6O57	ZR36057PQC ZORAN PCI Bridge (interface for transferring video across the PCI bus)
@@ -5088,6 +5150,7 @@
 	7213	
 	7222	unknow pci to pcmcia bridge
 	7223	OZ711M3/MC3 MemoryCardBus Controller
+	8130	0x8130 o2 sd card reader
 	8231	OZ600XXX O2Micro OZ600XXX Memory Card 
 	8330	 PCI\VEN_1217&DEV_8331&SUBSYS_049A1028&REV_05\4&34 Mass storage controller [0180]
 	8331	OZ600xxx O2Micro Integrated MS/PRO controller
@@ -5170,7 +5233,7 @@
 123F	C-Cube Microsystems
 	00E4	cl 480 MPEG
 	6120	12.03 DVD device
-	8120	176 i845E
+	8120	176 i440B
 	8888	12.03 cPEG C 3.0 DVD/MPEG2 Decoder
 1240	Marathon Technologies Corp.
 1241	DSC Communications
@@ -5227,7 +5290,7 @@
 	1988	
 1259	Allied Telesyn International
 	2503	Realtek 8139b 
-	2560	AT-2560 Fast Ethernet Adapter (i82557B)
+	2560	82845G AT-2560 Fast Ethernet Adapter (i82557B)
 	c107	Realtek 8110S 
 125A	ABB Power Systems
 125B	Asix Electronics Corp.
@@ -5251,7 +5314,7 @@
 	199B	ES1938/41/46 solo audio Maestro-3.COMM PCI Voice+audio
 	2808	ES336H PCI Fax Modem (later model)
 	2828	ES2828S TeleDrive
-	2838	ES56H-PI4555 Data Fax Modem
+	2838	ES56H-PI4555 Motorola chipset PCI Data Fax Modem
 	2839	2838 Superlink Modem/V.92 chipset 56K
 	2898	2898 TelDrive ES56T-PI family V.90 PCI modem
 125E	Specialvideo Engineering SRL
@@ -5282,6 +5345,7 @@
 	0204	Unknown Tektronix IO Processor / Tektronix PCI Acquisition Interface Rev 204
 1269	Thomson-CSF/TTM
 126A	Lexmark International Inc.
+	269B	631xESB/6321ESB/3100 SM Bus Controller
 126B	Adax Inc.
 126C	Nortel Networks Corp.
 	1F1F	e-mobility 802.11b Wireless LAN PCI Card
@@ -5299,7 +5363,7 @@
 1270	Olympus Optical Co. Ltd.
 1271	GW Instruments
 1272	Telematics International
-	0780	PCI\VEN_1272&DEV_0780&SUBSYS_00000008&REV_7A\3&61A PCI\VEN_1272&DEV_0780&SUBSYS_00000008&REV_7A\3&61AAA01&0&58
+	0780	PCI\VEN_8086&DEV_1C3A&SUBSYS_1C3A1458&REV_04 PCI\VEN_8086&DEV_1C3A&SUBSYS_1C3A1458
 	9876	PCI\VEN_1272&DEV_0780&SUBSYS_00000008&REV_7A\3&61A PCI\VEN_1272&DEV_0780&SUBSYS_00000008&REV_7A\3&61AAA01&0&58
 1273	Hughes Network Systems
 	0002	DirecPC t9p17af-01
@@ -5748,7 +5812,7 @@
 	5101	5101 Route 56
 	5102	PCI-ACB RS-232 synchronous card
 	7101	Single Port RS-232/422/485/520
-	7201	Dual Port RS-232/422/485 Interface
+	7201	  Dual Port RS-232/422/485 Interface
 	7202	Dual Port RS-232 Interface
 	7401	Four Port RS-232 Interface
 	7402	Four Port RS-422/485 Interface
@@ -5808,7 +5872,7 @@
 	620A	GA620 Toshiba
 	622A	GA622 
 	630A	GA630 
-	8169	GA311 Gigabit Ethernet Adapter
+	8169	GA511 Gigabit Ethernet Adapter
 	F311	FA311 Fast Ethernet Adapter
 	F312	
 1387	Curtiss-Wright Controls Electronic Systems
@@ -5978,7 +6042,7 @@
 	00111	520098396000734 sound card
 	0100	CMI8338/PCI C3DX PCI
 	0101	CMI8338-031 PCI Audio Device
-	0111	CMI8738/cd3x-pci audio C-Media Audio Controller
+	0111	CaudioMI8738/cd3x-pci   C-Media Audio Controller
 	0112	CMI-8378B/PCI-6CH PCI Audio Chip
 	0191	PCI\VEN_13F6&DEV_0111&REV_10 CMI 8738 8CH Sound Card
 	0211	PCI\VEN_13F6&DEV_0211&SUBSYS_021113F6&rev_10\3&267  Driver controller pci simple comunications - PCtel HSP56 Micro Modem Driver  
@@ -5991,11 +6055,11 @@
 13FA	Pentland Systems Ltd.
 13FB	Aydin Corp
 13FD	Micro Science Inc
-	160E	a a
+	160E	Initio1606l SATA/150 device to USB 2.0
 	161F	1D59CB92 s
 	1840	INIC-1608L SATA/150 device to USB 2.0 Host interface (http://www.initio.com/Html/inic-1608.html)
 13FE	Advantech Co., Ltd.
-	1240	NOVA MCX314 4-Axis Stepping/Servo Motor Card
+	1240	PS2134CE-0 4-Axis Stepping/Servo Motor Card
 	1600	PCI-1610CU/9-AE 4-port RS-232 UNI PCI COMM card w/S&I&D
 	1680	PCI-1680U-A 2-port CAN UniversalPCI Communication Card with Isolation
 	16FF	PCI-1610CU/9-AE 4-port RS-232 UNI PCI COMM card w/S&I&D
@@ -6012,7 +6076,7 @@
 1400	ArtX Inc
 	0001	
 	0003	
-	0004	m583mlr m583mlr
+	0004	030000 030000
 	1401	9432 TX hd 2600xt
 1402	Meilhaus Electronic GmbH Germany
 	2E00	ME-2000/2600 Multifunction Data Aquistion card
@@ -6026,7 +6090,7 @@
 	0102	Lava Quattro PCI C/D
 	0110	0110 Lava DSerial PCI Port A
 	0111	nep5p Lava DSerial PCI Port B
-	0180	Lava Octopus PCI Ports 1-4
+	0180	Lava Octopus PCI Ports  Lava Octopus PCI Ports 1-4
 	0181	Lava Octopus PCI Ports 5-8
 	0200	9923 LavaPort Dual-650 PCI
 	0201	LavaPort Quad-650 PCI A/B
@@ -6043,7 +6107,7 @@
 	120	Lava Quattro 550 PCI A/B
 	121	Lava Quattro 550 PCI C/D
 	520	s s
-	8000	PCI\VEN_1407&DEV_8000 Lava Parallel
+	8000	PCI\VEN_197B&DEV_2382 Lava Parallel
 	8001	Lava Dual Parallel port A
 	8002	9923 Lava Dual Parallel port A
 	8003	Lava Dual Parallel port B
@@ -6207,11 +6271,14 @@
 148E	OSI Plus Corporation
 148F	Plant Equipment Inc.
 	1000	unknown Ralink Motorola BC4 Bluetooth 3.0+HS Adapter
+	2000	Unknown Ralink Motorola BC8 Bluetooth 3.0 + HS Adapter
 	2070	1.0 802.11 g WLAN
 	2573	1192Af7b 802.11 bg
 	2870	1.0 802.11 n WLAN
+	3000	RT3290 802.11n + Bluetooth 3.0
 	3070	RT3070L FreeWifiLink D3-10000N
 	5370	Ralink RT2870 802.11n USB Wireless LAN Card
+	9021	Unknown Netopia USB b/g Adapter (black)
 1490	TC Labs Pty Ltd.
 1491	Futronic 
 	0020	USB Fingerprint Scanner Model FS80 USB Fingerprint Scanner Model FS80
@@ -6352,6 +6419,7 @@
 	14E4	BCM5787M 802.11b/g Wireless Lan Controller
 	1600	BCM5752 NetXtreme BCM5752 Gigabit Ethernet PCI Express
 	1601	BCM5752M NetXtreme Desktop/Mobile
+	1610	BCM70010 Broadcom BCN70010 Video Decoder
 	1612	BCM70010/BCM70012 Broadcom Video Decoder/Accelerator
 	1615	BCM70015 Broadcom Crystal HD Video Decoder
 	161F	BCM70010/BCM70012 AVC/VC-1/MPEG PCI Express® HD Decoder Chipset for Netbooks/Nettops
@@ -6366,12 +6434,13 @@
 	164D	83471043 NetXtreme Fast Ethernet Controller
 	1650	BCM57711 Broadcom PCIe 10Gb Network Controller 
 	1653	BCM5788 Broadcom NetXtreme Gigabit Ethernet
-	1654	BCM5750A1 NetXtreme Gigabit Ethernet
+	1654	BCM5705A2 NetXtreme Gigabit Ethernet
 	1658	BM5750 NtXtreme Gigabit Ethernet
 	1659	BCM5721 NetXtreme Gigabit Ethernet PCI Express
 	165A	94309 Broadcom NetXtreme BCM5722 Gigabit
 	165D	Aspire57050G Broadcom NetXtreme Gigabit Ethernet
 	165E	3C905B NetXtreme Gigabit Ethernet
+	165F	BCM5720 Broadcom NetXtreme 5720 Gigabit Ethernet
 	166a	BCM5780 Broadcom NetXtreme Gigabit Ethernet 5780
 	166B	BCM5780S NetXtreme Gigabit Ethernet
 	166D	BCM5705MFE NetXtreme Ethernet 100kB
@@ -6397,7 +6466,7 @@
 	1692	BCM57780 NetLink
 	1693	BCM5787 Ethernet Controller Broadcom Netlink Gigabit
 	1696	BCM5782 Broadcom NetXtreme Gigabit Ethernet 
-	1698	BCM5784M NetLink-FOR DELL LAPTOP AND MAYBE OTHERS
+	1698	02941028 NetLink-FOR DELL LAPTOP AND MAYBE OTHERS
 	169A	BCM5787 Broadcom Netlink (TM) gigabit ethernet
 	169B	BCM5786 NetXtreme Gigabit Ethernet
 	169C	17351043 Broadcom NetLink (TM) Gigabit Ethernet
@@ -6416,10 +6485,11 @@
 	16f7	BCM5753 NetXtreme BCM5753 Gigabit PCI Express
 	16FD	BCM5753M NetXtreme Gigabit Ethernet PciXpress
 	16FE	BCM5753F NetXtreme Gigabit Ethernet
-	170C	pci VEN 4348 DEV 5053 Broadcom 440x 10/100 Integrated Controller
+	170C	pci VEN 4348 DEV 7053 Broadcom 440x 10/100 Integrated Controller
 	170D	BCM5901 NetXtreme
 	170E	BCM5901 NetXtreme 100Base-TX
 	1713	BCM5906m Broadcom NetLink (TM) Fast Ethernet
+	333	BCM53333 16p 1G (PHY)
 	3352	BCM3352 BCM3352 QAMLink® Single-Chip 4-Line VoIP
 	3360	BCM3360 Advanced PHY Broadband Gateway Cable Modem
 	4211	dell 10Mb/s NIC
@@ -6439,12 +6509,12 @@
 	4321	BCM4306 802.11a Wireless LAN Controller
 	4322	BCM4306 UART
 	4323	BCM4306 V.90 56k Modem
-	4324	BCM4309 802.11a/b/g Wireless LAN Контроллер
+	4324	BCM4357 802.11a/b/g Wireless LAN Контроллер
 	4325	BCM4306 802.11b/g Wireless LAN Controller
 	4326	BCM4306 Chipcommon I/O Controller?
 	4328	BCM4321KFBG Broadcom BCM43xx 1.0 (5.10.91.27)
 	4329	BCM43XX Broadcom 802.11n Network Adapter
-	432B	4322 WIRELESS for Hp pavilion, Wireless for macbook pro (late 2009 model), Wireless for Dell E6500,E6400
+	432B	4322 Broadcom Wireless LAN Driver 
 	4353	BCM943224HMS Broadcom Half Mini PCI Express Wifi card / DL1520
 	4357	BCM94322c5HM Broadcom WiFi 802.11b/g/n
 	4358	BCM943227HM4L Broadcom 802.11n WLAN module | http://global-download.acer.com/GDFiles/Driver/Wireless%20LAN/Wireles
@@ -6476,8 +6546,9 @@
 	4718	BCM47xx Sentry5 Crypto Accelerator
 	4720	BCM4712 MIPS CPU
 	4726	7175144f 01
-	4727	Broadcom 14E4 WLAN Broadcom 4313 802.11 Express
+	4727	BCM43XX Broadcom 802.11n Network Adapter
 	4728	7175144f 01
+	53343	BCM53343 16P 1G  (PHY)
 	5365	BCM5365P Sentry5 PCI to SB Bridge
 	5600	BCM5600 StrataSwitch 24+2 Ethernet Switch Controller
 	5605	BCM5605 StrataSwitch 24+2 Ethernet Switch Controller
@@ -6511,9 +6582,17 @@
 	8022	BCM53022 Next generation router SOC with gigabit switch with RGMII/SDIO
 	8023	BCM53023 Next generation router SOC with gigabit switch with SATA instead of RGMII/SDIO
 	8025	BCM53025 Next generation router SOC with gigabit switch with RGMII/SDIO, GMII, SGMII and SATA
+	8334	BCM53334 24 1G
+	8342	BCM53342 8 1G (PHY)
+	8344	BCM53344  24P 1G +4P 1G  (PHY)
+	8346	BCM53346 24P 1G +4P 1G/10G  (PHY)
+	8393	BCM53393 14P (1G,  (no PHY)
+	8394	BCM53394 10P 1G + 4x1/2.5/5/10G  (no PHY) 
 	9867	900000000 900000000
 	9876	Texas Instruments PCI GemCore based SmartCard cont 0x14E4
+	A8D6	BCM6368 Broadcom 802.11n WLAN chip
 	B150	BCM56150 Hurricane2 (Lightly Managed) 24P 1G +4P 1G/10G  (PHY)
+	b152	BCM56152 24P  1G (PHY)
 	B340	BCM56340 48-port multi-layer switch with embedded CPU
 	B450	BCM56450 100G Multi-layer Ethernet Switch
 	B640	BCM56640 260Gbps Extensible Switch with 100GE
@@ -6551,7 +6630,7 @@
 	2710	PCI modem card Conexant
 	2740 	CC_0780 Pci Simple Communtications Controller
 	2B10	0x14F1 0x14F1
-	2BFA	0x0000ffff HD AUDIO soft data fax modem with smartcp
+	2BFA	0x0000ffff Conexant HDA D110 MDC v.92 Modem
 	2C06	136 Conexant HD Audio SoftV92 Data Fax Modem with SmartCP
 	2F00	00101767 HSF 56k HSFi Modem
 	2f01	0x0780 missing driver for pci simple communications controller
@@ -6670,6 +6749,7 @@
 	0530	CB-712/714/810 Memory Stick Card Reader
 	0550	CB-712/714/810 Secure Digital Card Reader
 	0551	10C11734 ven1524&dev_0551&SUBSYS_009F1025&REV_01
+	0555	10c11734 ven1524&dev_0551&SUBSYS_009F1025&REV_01
 	0610	??? PCI Smart Card Reader Controller
 	0730	0x0751 CardBus Controller
 	1025	1025123 PCI\VEN_0001&DEV_1025&SUBSYS_1025123A&REV_01\4&1351887D&0&58F0
@@ -6717,7 +6797,7 @@
 153F	MIPS Technologies, Inc
 	dead	xx12345 Not a chip ...
 1540	Provideo Multimedia Co Ltd
-	9524	saa7134 PAL/SECAM TV card w/ FM1216ME MK3 tuner (+FM radio)
+	9524	saa7130 PAL/SECAM TV card w/ FM1216ME MK3 tuner (+FM radio)
 1541	Telocity Inc.
 1542	Vivid Technology Inc
 1543	Silicon Laboratories
@@ -6877,12 +6957,15 @@
 15AC	North Atlantic Instruments
 15AD	VMware Inc.
 	0405	9500MGS NVIDIA
-	0710	Virtual SVGA
+	0710	0740 Virtual SVGA
 	0720	VMXNET VMware PCI Ethernet Adapter
 	0740	0X0880 VMWare VMCI Bus Device
 	0770	n/a Standard Enhanced PCI to USB Host Controller
+	0778	n/a Sabrent USB-to-Parallel Adapter
 	07B0	VMXNET 3 VMware vSphere 4 PCI Ethernet Adapter
 	0801	n/a PCI Memory Controller
+	1975	N/A High Definition Audio Codec
+	1977	N/A High Definition Audio Controller
 15AE	Amersham Pharmacia Biotech
 15B0	Zoltrix International Limited
 	0001	FM-3986 Pctel
@@ -6895,6 +6978,7 @@
 	6274	MT25204 InfiniHost III Lx
 	6278	MT25208A0-FCC InfiniHost TM III Ex
 	6282	MT25218 MT25218 [InfiniHost III Ex]
+	634A	MT2518 Mellanox ConnectX VPI (MT2548) - PCIe 2.0 2.5GT/s, IB DDR /10GigE Network Adaptor
 15B4	CCI/Triad
 15B5	Cimetrics Inc
 15B6	Texas Memory Systems Inc
@@ -6907,6 +6991,7 @@
 15BC	Agilent Technologies
 	0101	n2530a DX2+ FC-AL Adapter
 	0103	QX4 4 Port Fibre Channel Controller
+	1200	n/a Agilent QX4 Fibre Channel Controller
 	2530	??? HP Communications Port
 	2531	??? HP Toptools Remote Control Adapter
 	2532	??? HP Toptools Remote Control Adapter
@@ -6954,9 +7039,9 @@
 15DD	Sigmatel Inc.
 	7664	vgn-ar51j idt high audio
 	7680	2772 SIGMATEL STAC 92XX C-Major HD Audio
-	769	7690 9200 HD Audio CODEC
+	769	7690 9200 HD Ð�уÐ'ио КОДЕК
 	7690	10F70000 You'll Love me 4 this/ visit http://wendhelofopportunity.info Support Me!
-	8384	v1.0 Intel Audio Studio
+	8384	HDAUDIO\FUNC_01&VEN_8384&DEV_7627&SUBSYS_80862503& Intel Audio Studio
 	9876	1 1
 15DE	Malleable Technologies Inc
 15E0	Cacheflow Inc
@@ -6988,7 +7073,7 @@
 15F0	B-Tree Systems Inc
 15F1	Times N Systems Inc
 	2F30	CX11252-15 Conexant HSFi
-15F2	Diagnostic Instruments Inc
+15F2	SPOT Imaging Solutions a division of Diagnostic Instruments, Inc
 	0001	Spot RT Spot RT Interface Board
 	0002	Spot RT #2 Spot RT Interface Board
 	0003	Spot Insight Spot Insight Interface Board
@@ -7095,7 +7180,7 @@
 	2416	Techwell - TW2804  Model - JSA-2416 DVR Video Capture Card 16CH
 163C	intel
 	3052	R6793-11 RS56/HSP-PCI
-	FF02	82801 GB PCI\VEN_8086&DEV_29C4&SUBSYS_50448086&REV_02Intel Chipset
+	FF02	82801 GB PCI Bridge - 244E
 163D	Heidelberg Digital LLC
 163E	3dpower
 163F	Renishaw PLC
@@ -7188,30 +7273,36 @@
 168C	Atheros Communications Inc.
 	 001c	AR5005GS PCI\VEN_168C&DEV_0031&SUBSYS_137B103C&REV_01\4&23F5EDAD&0&00E0
 	00027	E017105B Atheros AR5B95 Wireless LAN 802.11 a/b/g/n Controller
-	0007	AR5B97 Wireless Network Adapter
+	00030	PCI\VEN_168C&DEV_0030&SUBSYS_3112168C&REV_01 TP-LINK 450Mbps Wireless N Adapter
+	0007	AR5007EG Wireless Network Adapter
 	0011	AR5bmb5 802.11a Wireless Adapter
 	0012	AR5211  PCI\VEN_1217&DEV_7130&SUBSYS_FF501179&REV_01 DELL Latitude C510 as mini-PCI board behind the larg
-	0013	AR5235 PCI\VEN_168C&DEV_0023&SUBSYS_3A621186&REV_01
+	0013	Netgear WPN311 Netgear RangeMax WPN311 PCI Wireless NIC
 	001A	Atheros AR5005GS http://support1.toshiba-tro.de/tools/updates/atheros-wlan/atheros-wlan-xp-7702331.zip
 	001B	AR5006X 802.11abg NIC
-	001c	nvidia geforce gt540m USB\VID_0BDA&PID_8723\00E04C000001
-	001C other	AR5BXB63 Atheros AR5007EG WiFi Chip
+	001c	Dell Wireless 1510 Wireless-N Mini-Card Wireless N PCI\VEN_8086&DEV_0106&SUBSYS_C652144D&REV_09\3&11583659&0&10  
+	001C other	AR5BXB63 Atheros AR5BXB63 WWAN Chip
 	001c_again	AR5BXB61 AR5006EX AR5423a
 	001D	TP-Link TL-WN350GD PCI\VEN_168C&DEV_001D&SUBSYS_2055168C&REV_01\4&25700A26&0&3020
+	002	c660 the drivers for this device are not installed
 	0023	AR5416 802.11a/b/g/n Wireless PCI Adapter
 	0024	AR5B95 Atheros 802.11a/b/g/n
 	0027	E017105B Atheros AR5B95 Wireless LAN 802.11 a/b/g/n Controller
-	002A	2 Atheros AR5BXB92 
-	002B	E035105B Atheros AR5B95 Wireless LAN 802.11 a/b/g/n Controller
+	002A	2 Atheros AR5B91
+	002B	E016105B Atheros AR5B95 Wireless LAN 802.11 a/b/g/n Controller
 	002C	AR5008 Wireless 802.11 a/b/g/n Dualband Network Adapter (PCI-Express)
 	002D	AR9287 rev01 802.11b/g/n
 	002E	AR9285 Atheros ar9285 PCI Capabilities:  Offset ID Description 
 	0030	1102 - 1103 Killer Wireless - N
-	0032	0x0032C AR9485WB-EG Wireless Network Adapter
+	0032	0x0209 AR9485WB-EG Wireless Network Adapter
+	0034	unknown Atheros wifi LAN
+	0037	AR1111 Atheros AR1111 WB-EG Wireless Network Adapter
+	003e	1 1
 	007	AR5007UG Wireless Network Adapter
+	0280	0x002b PCI\VEN_168C&DEV_002B&SUBSYS_30AF185F
 	1014	AR5112 Atheros AR5212 802.11abg wireless Drivers
 	14F1	nForce6100-430   PCI\VEN_168C&DEV_001A&SUBSYS_04181468&REV_01\4&FCF0450&0&10A4
-	168C	0x002b PCI\VEN_168C&DEV_002B&SUBSYS_30AF185F 
+	168C	0x001b PCI\VEN_168C&DEV_002T&SUBSYS_034105B@REV_01
 	1a3b	ar8132 802.11a/b/g/n Wireless PCI Adapte
 	6666	AR5007UG Atheros AR5B95 Wireless LAN 802.11 a/b/g/n Controller
 	9876	AR5B95 Atheros AR5B95 Wireless LAN 802.11 a/b/g/n Controller
@@ -7301,6 +7392,7 @@
 	9501	RV670  ATI Radeon HD 3870 
 	E106	0x954F Graphics Chipset	ATI Radeon HD 4300/4500 Series       	
 	e131	RV770 ATI 4870
+	E140	5870 Sapphire HD 5870 1GB GDDR5
 1752	Global Brands Manufacture Ltd.
 1753	TeraRecon, Inc.
 	1001	VP500 VolumePro 500
@@ -7323,7 +7415,7 @@
 	7291	RV560 HIS  Radeon X1650 XT
 17BE	Philips Semiconductors
 17C0	Wistron Corp.
-	12ab	
+	12ab	intel
 17C4	Movita
 17CC	NetChip
 	1978	net 2280 usb 2.0 device controller
@@ -7358,7 +7450,7 @@
 1814	Ralink Technology, Corp.
 	0001	...B742000 ...I don't know
 	0101	2460  802.11b RT2460  802.11b Baseband/MAC integrated chip
-	0201	PCI\VEN_1814&DEV_0781&SUBSYS_F0511814  Ralink Chipset 802.11b/g WLAN Card
+	0201	PCI\VEN_1814&DEV_3290&SUBSYS_191c103C&rev-00 Ralink Chipset 802.11b/g WLAN Card
 	0201 (1)	RT 3070 Ralink RT2500 802.11b/g WLAN Card
 	0201 (2)	001167F044E5 W-LAN 802.11b/g
 	0201 (3)	RT2560F RaLink
@@ -7369,12 +7461,14 @@
 	0401	RT 2661 Ralink MIMO RT 2661 Wireless 54 Mbps
 	0601	RT2860T b/g/n  Wlan
 	0701	RT2860T 802.11 bgn
-	0781	RT2790T/RT2860/RT2890 Wireless 802.11 bgn PCI-e
+	0781	RT2790T/RT2860/RT2890/RT2700E Wireless 802.11 bgn PCI-e
 	1418	0x14FI 802.11b/g Wireless LAN
 	14F1	0x1814 PCI\VEN_168C&DEV_001A&SUBSYS_04181468&REV_01\4&FCF0450&0&10A4
 	201	25601814&REV_01 Ralink RT2500 Wireless Lan Card
 	3060	RT3060 Ralink corp. RT3060 Wireless 802.11n PCI adapter
 	3090	Ralink RT3090 Ralink RT3090 Wireless Lan Card with Bluetooth
+	3290	RT3290 802.11n + Bluetooth 3.0
+	3298	- Ralink Bluetooth
 	3592	RT3592 Wireless LAN a/b/g/n plus Bluetooth 3.0 combo
 	5360	RT5360  http://www.wikidevi.com/wiki/D-Link_DWA-525_rev_A2
 	5390	RT5390 Ralink RT5390 802.11b/g/n WiFi
@@ -7426,12 +7520,13 @@
 	000a	232/4-PCI-335 Fastcom:232/4-PCI-335 Asyncronous RS232 serial adapter
 18FB	Resilience Corporation
 1904	Ritmo
+	8139		8139 Realtek RTL8139 PCI Fast Ethernet Adapter
 	8139	8139 Realtek RTL8139 PCI Fast Ethernet Adapter
 1905	WIS Technology, Inc.
 1910	Seaway Networks
 	0001	SW5000-NCA Seaway Network Content Accelerator
 1912	usb 3.0 Renesas Electronics
-	0015	   
+	0015	 upd720202  nec
 	0015_	EC01-P Renesas Electronics USB 3.0 Host Controller
 1931	Option NV
 1941	Stelar
@@ -7439,18 +7534,19 @@
 1969	Atheros Communications
 	1026	AR8121/AR8113  PCI-E ETHERNET CONTROLLER 
 	1048	Atheros L1 Gigabit Ethernet 10/100/1000 Base-T Controller
+	1060	AR8162 PCI-E Fast Ethernet Controller
 	1062	AR8132 Atheros AR8132 PCI-E Fast Ethernet Controller
 	1062c	Atheros L1  Gigabit Ethernet 10/100/1000 Base-T Controller
 	1063	AR8131 Atheros AR8131 PCI-E Gigabit Ethernet Controller
 	1073	AR81512 AR81511
-	1083	1083 1083
+	1083	1083 Atheros AR8151 PCI-E Gigabit Ethernet Controller (NDIS 6.20)
 	1091	AR8161/8165 PCI-E Gigabit Ethernet Controller
 	168c	Atheros L1  Gigabit Ethernet 10/100/1000 Base-T Controller 
 	1969	Atheros L1  Gigabit Ethernet 10/100/1000 Base-T Контроллер 
 	2048	Atheros L2 Fast Ethernet 10/100 Base-T Controller
 	2060	f121 AR8152 v1.1 Fast Ethernet
 	2061	1 Ethernet Controller
-	2062	ff1e1179 c1
+	2062	ff1e1179 Qualcomm Atheros AR8152/8158
 	4747	1969 VEN_1969
 	9876	Atheros L2 Fast Ethernet 10/100 Base-T Controller 
 1971	AGEIA Technologies, Inc.
@@ -7458,7 +7554,7 @@
 	1011	PCI\\VEN_1971&DEV_1011&CC_FF00 AGEIA PhysX 100 Series PCI Card
 	1021	AGEIA PhysX 200 Series PCI Express Card
 197B	JMicron Technology Corp.
-	0250	JMC2XX JMC250 PCI Express, Gigabit Ethernet
+	0250	JMC25 JMC250 PCI Express, Gigabit Ethernet
 	0256	JMC2XX JMC260 PCI Express Fast Ethernet
 	0260	JMC2XX JMC260 PCI Express Fast Ethernethc
 	197b	JMB38X JMB38X SD/MMC Host Controller 
@@ -7473,7 +7569,7 @@
 	2383	0261 JMB38X MS Host Controller
 	2384	JMB38X JMB38X xD Host Controller
 	2391	9.2.0.1031 Intel
-	2392	 JMicron Media Card Reader Driver   JMicron Media Card Reader Driver 
+	2392	 JMicron Media Card Reader Driver   JMicron Media Card Reader Driver
 198a	Nallatech
 	0210	  XMC-210
 	0220	  XMC-220
@@ -7510,7 +7606,7 @@
 	0001	GeForce4 MX 440 nVidia Corporation NV17
 1B21	Asustek - ASMedia Technology Inc.
 	1041	SUBSYS_21047174 USB 3.0 Host Controller Driver for Windows 7
-	1042	? AS Media Universal Serial Bus Controller
+	1042	? ASMedia USB 3.0 XHCI Controller
 1B6F	Etron
 	7023	DEV_7023&REV_010 Etron USB 3.0 Extensible Host Controller
 1B73	Fresco Logic Inc.
@@ -7519,6 +7615,7 @@
 1BAD	ReFLEX CES
 1C0F	Monarch Innovative Technologies Pvt Ltd's 
 1C32	Highland Technology, Inc.
+1c39	Thomson Video Networks Corporate Headquarters
 1DE1	Tekram
 	0045	RaidCore5000 Series Tekram SAS860 Embedded 8xSAS/SATAII RAID
 	0058	RC5000Series Tekram Elrond 8xSAS/SATAII RAID
@@ -7559,11 +7656,11 @@
 	0007	3D Extreme Permedia II 2D+3D Accelerator
 	0008	GLint Gamma G1 
 	0009	Permedia2v 2d+3d chipset, integrated ramdac
-	000A	Permedia 3 Driver Ethernet Pci Ven 1969
+	000A	8086 Driver Ethernet Pci Ven 1969
 	000C	Permedia 3 video card
 	000D	GLINT R4 3D Accelerator
 	000E	GLINT Gamma G2 
-	0020	0x0020 3Dlabs Wildcat VP 880 Pro
+	0020	0x0024 3Dlabs Wildcat VP 880 Pro
 	0030	0x030000 3Dlabs Wildcat Realizm 800
 	0100	Permedia II 2D+3D Accelerator
 	1004	Permedia 3D+3D Accelerator
@@ -7609,9 +7706,10 @@
 	0303	ADPe-XRC-6T-L Full lenght PCI Express Xilinx Virtex-6 FPGA platform
 	0305	ADPe-XRC-6T Full length PC Card Xilinx Virtex-6 FPGA platform
 416C	Aladdin Knowledge Systems
-	0100	AlladinCARD 
+	0100	AlladinCARD Puerto paralelo PCI
 	0200	CPC 
 4348	wch.cn
+	1453	201105072 WCH353L
 	3253	32534348 dvdsd
 	5053	 5050 5050
 	7173	ch  CH35X
@@ -7736,7 +7834,7 @@
 7d1	D-Link Corporation
 	3304	graphic card 802.11N usb wifi device
 	3c03	DWL-G122 Wifi PCI Same chipset of RALINK  RT2500
-	3C07	D-Link Wireless G DWA-110 USB Adapter USB\VID_07D1&PID_3C07
+	3C07	D-Link Wireless G DWA-110 USB Adapter PCI\VEN_1799&DEV_700F&SUBSYS_700F1799&REV_20\3&61AAA01&0&48
 8080	Xirlink, Inc
 	1040	VIA 82C259 rev 0 PCI\VEN_8080&DEV_0016&SUBSYS_813D100D&REV_01\4&23C0b1C5&0&00F0
 8086	Intel Corporation
@@ -7750,14 +7848,17 @@
 	0084	Intel PROSet WiFi 1000 Intel Wireless Link WiFi 1000, download -> http://downloadmirror.intel.com/20791/eng/Wireless_14.3.0
 	0085	0x0280 Intel Centrino(R) Advanced-N 6205
 	0087	1306 00E1
-	008A	.53258086 Intel Centrino Wireless-N1030        Bluetooth - http://downloadcenter.intel.com/Detail_Desc.aspx?ag
+	008A	??? Intel Centrino Wireless-N1030
 	008B	Intel Wireless-N 1030 Intel(R) Centrino(R) Wireless-N 1030 
 	0091	622ANHW Intel® Centrino® Advanced-N 6230
 	0102	0001 Intel HD Graphics 2000
+	0106	HD Graphics 3000/2000 2nd Generation Intel® Core™ Processors with Intel® HD Graphics 3000/2000
+	010A	010A Lenovo TS130 Intel Video Adapter HD
 	0111	82810e Intel Graphics Conroller
 	0116	intel core i3 Intel HD Graphics 3000
 	0189	Intel Centrino Wireless-N 1030 Bluetooth Adapter Intel Centrino Wireless Bluetooth 3.0 + High Speed Adapter
 	027AE	82945GM Mobile Intel(R) 945 Express Chipset Family
+	027D8	293esd Mobile PCI-to-PCIsdsdsdI2)
 	0283E	AA01211025 Intel(R) ICH8 Family SMBus Controller
 	0308	3220 PCI Audio Device + modem
 	0309	80303 I/O Processor PCI-to-PCI Bridge Unit
@@ -7809,6 +7910,7 @@
 	0536	E8870SP Scalability Port Switch Global Registers
 	0537	E8870SP Interleave Configuration Registers
 	0600	1043 Storage RAID Controller
+	0780	3.0/2.0 Intel B75 Express Chipset
 	0800	10B01734 pci/ven_8086&dev_27da&subsys_30b2103c&rev_02\3&b1bfb68&0&fb
 	0885	612BNXHMW Intel Centrino Wireless-N + WiMAX 6150
 	0896	Wireless-N 130 Intel Centrino Wireless-N 130
@@ -7817,6 +7919,7 @@
 	0962	80960RM/RN i960RM/RN Microprocessor/Bridge
 	0964	80960RP i960 RP Microprocessor Bridge
 	0BE1	0000000 Intel Graphics Media Accelerator 3600 Series
+	0C05	V9201015 Intel(R) 6 Series/C200 Series Chipset Family SMBus Controller
 	1000	82542 Gigabit Ethernet Controller
 	1001	2572 10/100/1000 Ethernet Controller (Fiber)
 	1002	Pro 100 LAN+Modem 56 CardBus II
@@ -7898,6 +8001,7 @@
 	109c	e1qexpress HP E1Q Express
 	10a7	82575 ? 82575EB Gigabit Network Connection
 	10a9	82575 ? 82575EB Gigabit Backplane Connection
+	10b5	82546GB Quad Port Gigabit Ethernet Controller
 	10b9	82572GI Intel PRO/1000 PT Desktop
 	10BD	82566DM Intel 82566DM Gigabit Ethernet Adapter
 	10C0	8082 Intel(R) 82562V-2 10/100 Network Connection
@@ -7912,6 +8016,7 @@
 	10e7	82576 ? 82576 Gigabit Network Connection
 	10E8	82576 E64750-xxx Intel Gigabit ET Quad Port Server Adapter
 	10EA	82577LM Intel 82577LM Gigabit LAN Driver 
+	10EC	Realtek AC97Audio Realtek 171 High Definition Audio
 	10EF	Intel® 82578DM Gigabit Ethernet Controller Intel® 82578DM Gigabit Ethernet Controller
 	10F0	82578 Intel(R) 82578DC Gigabit NIC
 	10F5	82567LM Intel®  82567LM-2 Gigabit Network Connection
@@ -7939,7 +8044,7 @@
 	1226	82596 EtherExpress PRO/10
 	1227	82801db ich4 LAN Controller with 82562EM
 	1228	EE PRO/100 Smart Intelligent 10/100 Fast Ethernet Adapter
-	1229	8086 Intel(R) PRO/100 M 00000Desktop Adapter   http://downloadmirror.intel.com/8659/eng/LAN_ALLOS_11.2_PV
+	1229	1e22 Intel(R) PRO/100 M 00000Desktop Adapter   http://downloadmirror.intel.com/8659/eng/LAN_ALLOS_11.2_PV
 	122D	82437FX System Controller (TSC)
 	122E	82371AB/EB PCI PCI to ISA Bridge (Triton)
 	1230	FW82371AB IDE Interface (Triton)
@@ -7994,20 +8099,24 @@
 	1c02	8086&dev_1c02 sata ahci contoller
 	1c02_	8086&dev_1c02 Intel(R) Desktop/Workstation/Server Express Chipset SATA AHCI Controller
 	1C03	Intel(R) Mobile Express Chipset SATA AHCI Controll Intel(R) CPT Chipset Family 6 Port SATA AHCI Controller 
-	1C22	V9201015 Intel(R) 6 Series/C200 Series Chipset Family SMBus Controller
+	1C22	win7 32-bit (tc40140300b.exe) Intel(R) 6 Series/C200 Series Chipset Family SMBus Controller
 	1c34a	0780 pci simple communications controller
 	1c3a	161C103C Intel Management Engine Interface
 	1C3b	111 232
 	1C3D	Intel(R) 6 Series Series Chipset Family Intel(R) Active Management Technology - SOL
 	1E22	Intel(R) 7 SeriesC216 Chipset Family SMBus Host Co SM-Bus Controller of the Intel Z77 Chipset
-	1e31	Intel USB 3.0 eXtensible Host Controller Intel USB 3.0 eXtensible Host Controller
-	1E3A	1 PCI Simple Communications Controller
+	1e31	Intel USB 3.0 eXtensible Host Controller Intel USB 3.0
+	1E3A	? Intel Management Engine Interface (MEI)
 	1E3A_	C216 Intel 7 Series/C216
+	1E3A__	Z77 C216 Chipset - Platform controller hub
+	1E3D	3398103C Intel(R) AMT LMS_SOL for AMT 8.xx
 	1E59	140889 140889
 	2000	CA 95054 505943621
+	2014	0x18C9 Framegrabber
 	2048	Atheros L2 Fast Ethernet 10/100 Base-T Controller
 	2124	27DA PRO/100 VE Network Connection
 	2125	82801AA AC97 Audio Controller. website to download - http://www.intel.com/design/chipsets/manuals/29802801.p
+	2222	82801 Intel Management Interface
 	2255	810D1043 02\3
 	2406	82801 / ? AC97 Modem Controller / PCI Modem
 	2410	82801AA LPC Interface
@@ -8078,7 +8187,7 @@
 	24D2	82801EB/ER USB UHCI Controller #1
 	24D3	82801EB/ER SMBus Controller
 	24D4	82801EB/ER USB UHCI Controller #2
-	24D5	82801 EB/ER Audio Controller
+	24D5	AD1980 Not realtek, Soundmax Integrated Digital Audio (AD1980)
 	24D6	82801EB/ER AC'97 Modem Controller
 	24D7	82801EB/ER USB UHCI Controller #3
 	24DB	82801EB/ER EIDE Controller
@@ -8121,6 +8230,7 @@
 	2560	82845G/GL/GV/GE/PE DRAM Controller / Host-Hub I/F Bridge
 	2561	82845G/GL/GV/GE/PE Host-to-AGP Bridge
 	2562	82845G Integrated Graphics Device
+	2562@cc	82801FR SATA RAID CONTROLLER
 	2570	82865G/PE/P, 82848P DRAM Controller / Host-Hub Interface
 	2571	82865G/PE/P, 82848P PCI-to-AGP Bridge
 	2572	intel d865glc Integrated Graphics Device
@@ -8206,7 +8316,9 @@
 	2780	82915G Graphics device
 	2782	82915G Graphics device: 82915G/GV/910GL Express Chipset Family
 	2792	038000 Mobile Intel(R) 915GM/GMS/, 910GML Express Chipset Family
+	2794	945 Mobile chipset
 	27A0	874079 i945GM Express Chipset
+	27A1	Intel 82945PM Memory Controller Intel Corporation Mobile 945PM Express PCI Express Root Port
 	27A2	HPQ0006 Mobile Intel(R) 945 Express Chipset Family
 	27A6	945GM Intel 945GM/950
 	27B8	945GL PCI\VEN_8086&_27B8&SUBSYS_8179DEV1043&REV_01\3&11583659&0&F8
@@ -8224,8 +8336,8 @@
 	27CC	82801G Intel(R) 82801G (ICH7 Family) USB2 Enhanced Host Controller
 	27D0	82801G Intel(R) 82801G (ICH7 Family) PCI Express Root Port
 	27D2	82801G Intel(R) 82801G (ICH7 Family) PCI Express Root Port
-	27d8	FF311179 Realtek High Definition Audio Driver FF311179
-	27d8xzx	PCI\VEN_8086&DEV_27D8&SUBSYS_75291462&REV_01\3&115 Microsoft UAA Bus HD Audio
+	27d8	FF311179 Realtek High Definition Audio Driver FF311179 thequetta.com
+	27d8xzx	PCI\VEN_8086&DEV_2485&SUBSYS_AD021458&REV_02 Microsoft UAA Bus HD Audio
 	27D9	A62516F3 IDT High Definition Audio Driver	
 	27DA	82801G Intel[R] 82801G (ICH7 Family) C- 27DA
 	27DC	336C1462 Intel® PRO/100 VE Desktop Adapter
@@ -8287,10 +8399,10 @@
 	29B4	Q35-Chipset Intel(R) Management Engine Interface (HECI)
 	29B4&subys	4F4A8086&rev_02 
 	29B6	Q35 IDE Controller
-	29B7	Q35-Chipset Serial Over LA
+	29B7	Q35-Chipset Serial Over LAN
 	29C2	82G33 Intel(R) G33 chipset GMA3100 video Driver
 	29C2_	Intel G33 Intel(R) G33 chipset GMA3100 video Driver
-	29C4	Intel DG33BU Intel ME: Management Engine Interface
+	29C4	Intel DG33FB Intel ME: Management Engine Interface
 	29C6	G3x IDE Controller
 	29D4	82801 Intel Management Interface
 	29D6	Q33 IDE Controller
@@ -8313,11 +8425,11 @@
 	2E06	4x IDE Controller
 	2E12	- Intel Q45/Q43 Express Chipset
 	2e13	Intel Q43/Q45/G43/G45 (Eaglelake) Graphics Control Intel(R) 4 Series Internal Chipset
-	2E14	PCI\VEN_8086&DEV_1c22 SM BUS CONTROLLER
+	2E14	PCI\VEN_8086&DEV_1c22 Intel Management Engine Interface (HECI)
 	2E15	PCI\VEN_8086&DEV_29C2&SUBSYS_29C28086&REV_10\3&115 Intel AMT LMS_SOL for AMT 5.xx
 	2E16	4x IDE Controller
 	2E17	CC_0700 Intel AMT LMS_SOL for AMT 5.xx
-	2E24	PCI\VEN_8086&DEV_2E24&SUBSYS_00248086  Intel Management Engine Interface
+	2E24	PCI\VEN_8086&DEV_27D8&SUBSYS_30AA103C&REV_01\3&B1B Intel Management Engine Interface
 	2E24&CC	PCI\VEN_8086&DEV_2E24&SUBSYS_9042104D&REV_03\3&115 Intel Management Engine Interface
 	2E26	4x IDE Controller
 	2e29	2e29 Intel(R) 4 Series Chipset PCI Express Root Port - 2E29
@@ -8502,17 +8614,18 @@
 	7800	82740 AGP Graphics Accelerator
 	803b	0x104d 0x81ef
 	8083	Intel PM45 Intel Wireless WiFi Link 5100 ABGN 10/100/1000 Base T
-	8086	2200bghttp://www.pcidatabase.com/update_device.php PCI Simple Communications Controller
+	8086	http://www.pcidatabase.com/update_device.php PCI-&#1050;&#1086;&#1085;&#1090;&#1088;&#1086;&#1083;&#1083;&#1077;&#1088; Simple Communications
 	8086&DEV	9.3.0.1019 intel
+	8086&DEV-24C5	VIA vynil v700b VIA vynil v700b
 	8086&DEV_1040	SUBSYS_148A103C REV_00\3&61AAA01&0&60 
 	8086&DEV_24C5	82801DBM SoundMax Controller VIA vynil v700b
-	8086&DEV_3B64	SUBSYS_11171043 REV_06
+	8086&DEV_3B64	win7 32-bit pci simple communications controller 
 	8086&DEV_7191&SUBS	PCI\VEN_8086&DEV_27DE&SUBSYS_4720414E&REV_01\3&241 HDAUDIO\FUNC_01&VEN_8086&DEV_2802&REV_1000
 	80861	(0x2994) Intel(R) Management Engine Interface
-	8108	SCH US15WP Intel(R) Graphics Media Accelerator 500
+	8108	SCH US15WP Intel(R) Graphics Media Accelerator 500  http://downloadcenter.intel.com/Detail_Desc.aspx?lang=eng&D
 	811A	Atom SCH Atom SCH PATA
 	8186	i dont know i dont know
-	82801	82801DBM Realtek AC97
+	82801	24D5 Realtek AC97
 	84C4	82454KX/GX 450KX/GX PCI Bridge (Orion)
 	84C5	82453KX/GX 450KX/GX Memory Controller (Orion)
 	84CA	82451NX 450NX PCIset Memory & I/O Controller
@@ -8553,14 +8666,17 @@
 	B154	S21154AE/BE PCI to PCI Bridge
 	B555	21555 Non-Transparent PCI-to-PCI Bridge
 	C50	fd sdf
+	PCI\VEN_8086&DEV_2	11583659 PCI\VEN_8086&DEV_27DA&SUBSYS_31031565
+	PCI\VEN_8086&DEV_2	11583659 PCI\VEN_8086&DEV_27DA&SUBSYS_31031565
 	PCI\VEN_8086&DEV_3	11583659 PCI\VEN_8086&DEV_3B64&SUBSYS_3B648086&REV_06\3&11583659&0&B0 
 	x27c8	PCI\VEN_8086&DEV_27D8&SUBSYS_02D61028&REV_01\3&61A Microsoft UAA Bus HD Audio
 	x27d8	A62516F3 INTEL IDT Audio
 	x999	2930 PCI\VEN_8086&DEV_2930&SUBSYS_037E1014&REV_02\3&61AAA01&0&FB
 	_1c3a	REV_04 REV-04
-	_1E3A	not sure? i5 2500k?
+	_1E3A	3570 i5 2500k?
 	_3B64	REV_02 REV_02
-	__1c3a	REV_04 REV-04
+	__1c3a	SUBYS_319010919 REV-04 3&11583659
+	___1C3A	8086 Intel(R) Management Engine Interface
 	8671	
 8087	Intel
 	0028	NV05 MCP67 High Definition Audio
@@ -8712,12 +8828,14 @@
 9710	MosChip Semiconductor Technology
 	7705	ASIX MSC7705 MCS7705 -- USB 1.1 to Single Parallel Controller
 	7830	MCS7830 USB 2.0 to 10/100M Fast Ethernet Controller
+	8729	mcs7830 usb 2.0 10/100M ethernet adaptor
 	9805	9805 Netmos Parallel  port PCI card
 	9815	9815 MCS9815 / M-CAB Parallel Adapter
 	9835	9835 2 serial, 1 LPT port PCI Card
 	9845	NM9845CV 4 serial, 1 parallel port PCI card
-	9865	MCS9865 PCI Serial Port X2
+	9865	MCS9865 PCI Parallel Port 
 	9900	MCS9900CV-AA NetMOS Single Parallel Port Card
+	9912	9912 PCIe to Dual Serial and Single Parallel Controller
 	9922	MCS9922 PCIe to Dual Serial Port Controller
 9902	StarGen, Inc.
 	0001	SG2010 PCI-to-PCI Bridge
--- /sys/doc/port.ms	Wed Jan 30 23:15:08 2013
+++ /sys/doc/port.ms	Thu Feb 21 23:07:07 2013
@@ -294,10 +294,10 @@
 .SH
 The Broadcom 2835 operating system
 .PP
-This is terminal and CPU kernels for the ARM1176 processor
+This consists of terminal and CPU kernels for the ARM1176 processor
 in the Broadcom 2835 system-on-a-chip.
 The hardware includes VFP2 floating-point.
-It runs on the Raspberry Pi Model B.
+It runs on the Raspberry Pi Models A and B.
 .
 .ig
 .SH
--- /sys/include/a.out.h	Fri Sep 21 01:27:10 2012
+++ /sys/include/a.out.h	Mon Feb 25 23:23:00 2013
@@ -14,7 +14,7 @@
 #define HDR_MAGIC	0x00008000		/* header expansion */
 
 #define	_MAGIC(f, b)	((f)|((((4*(b))+0)*(b))+7))
-#define	A_MAGIC		_MAGIC(0, 8)		/* 68020 */
+#define	A_MAGIC		_MAGIC(0, 8)		/* 68020 (retired) */
 #define	I_MAGIC		_MAGIC(0, 11)		/* intel 386 */
 #define	J_MAGIC		_MAGIC(0, 12)		/* intel 960 (retired) */
 #define	K_MAGIC		_MAGIC(0, 13)		/* sparc */
--- /sys/include/ape/errno.h	Tue Jan 15 22:32:34 2013
+++ /sys/include/ape/errno.h	Fri Mar  1 00:30:46 2013
@@ -78,6 +78,9 @@
 #define ECANCELED	61
 #define EINPROGRESS	62
 
+/* from research unix */
+#define ETXTBSY		63
+
 #endif /* _POSIX_SOURCE */
 
 #endif /* __ERRNO */
--- /sys/man/1/8l	Fri Jan 25 01:18:34 2013
+++ /sys/man/1/8l	Sat Feb 23 00:23:43 2013
@@ -159,6 +159,8 @@
 .I 5l
 generates arm7500 floating-point
 instructions which are emulated in the kernel.
+.br
+.ne 6
 .TP
 .BI -H n
 Executable header is type
@@ -169,11 +171,26 @@
 The Next boot format is 3.  Type 4 in
 .I vl
 creates a MIPS executable for an SGI Unix system.
+There is often a type that produces ELF or ELF64 format;
+5 for ELF is common.
+See
+.B obj.c
+in the source directory for a complete list.
+.TP
+.B -P
+(ELF only)
+Executable is standalone boot image or kernel.
 .TP
 .BI -T t
-The text segment starts at address
+The text segment starts at (virtual) address
 .IR t .
 .TP
+.BI -F t
+(ELF only)
+The text segment starts at physical address
+.I t
+(by default the text segment's virtual start address).
+.TP
 .BI -D d
 The data segment starts at address
 .IR d .
@@ -211,7 +228,7 @@
 .BI -l lib
 arguments.
 .SH SOURCE
-.B /sys/src/cmd/8l
+.BR /sys/src/cmd/8l ,
 etc.
 .SH "SEE ALSO"
 .IR 8c (1),
--- /sys/man/8/9boot	Fri Dec  7 21:11:14 2012
+++ /sys/man/8/9boot	Mon Feb 25 02:56:36 2013
@@ -185,7 +185,7 @@
 .IR 9load ,
 the
 .I bootfile
-may be compressed with
+may be a Plan 9 boot image compressed with
 .IR gzip (1).
 In all cases,
 the uncompressed kernel must be in Plan 9 boot image or ELF format.
@@ -532,6 +532,7 @@
 common kernel source
 .PD
 .SH "SEE ALSO"
+.IR 8l (1),
 .IR cons (3),
 .IR booting (8),
 .IR dhcpd (8),
--- /sys/src/9/bcm/archbcm.c	Fri Jan 11 21:28:55 2013
+++ /sys/src/9/bcm/archbcm.c	Thu Feb 21 22:22:37 2013
@@ -18,6 +18,7 @@
 
 enum {
 	Wdogfreq	= 65536,
+	Wdogtime	= 5,	/* seconds, ≤ 15 */
 };
 
 /*
@@ -28,6 +29,7 @@
 		Password	= 0x5A<<24,
 		CfgMask		= 0x03<<4,
 		CfgReset	= 0x02<<4,
+	Rsts		= 0x20>>2,
 	Wdog		= 0x24>>2,
 };
 
@@ -50,6 +52,25 @@
 		;
 }
 
+static void
+wdogfeed(void)
+{
+	u32int *r;
+
+	r = (u32int*)POWERREGS;
+	r[Wdog] = Password | (Wdogtime * Wdogfreq);
+	r[Rstc] = Password | (r[Rstc] & ~CfgMask) | CfgReset;
+}
+
+void
+wdogoff(void)
+{
+	u32int *r;
+
+	r = (u32int*)POWERREGS;
+	r[Rstc] = Password | (r[Rstc] & ~CfgMask);
+}
+	
 void
 cpuidprint(void)
 {
@@ -59,6 +80,7 @@
 void
 archbcmlink(void)
 {
+	addclock0link(wdogfeed, HZ);
 }
 
 int
--- /sys/src/9/bcm/clock.c	Tue Jan 29 23:07:49 2013
+++ /sys/src/9/bcm/clock.c	Thu Feb 21 22:22:37 2013
@@ -84,6 +84,7 @@
 
 	tm = (Armtimer*)ARMTIMER;
 	tm->ctl = 0;
+	wdogoff();
 }
 
 void
--- /sys/src/9/bcm/fns.h	Fri Jan 25 23:05:05 2013
+++ /sys/src/9/bcm/fns.h	Thu Feb 21 22:22:37 2013
@@ -73,6 +73,7 @@
 extern int userureg(Ureg*);
 extern void vectors(void);
 extern void vtable(void);
+extern void wdogoff(void);
 
 /*
  * floating point emulation
--- /sys/src/cmd/5l/sched.c	Thu Feb 28 23:40:32 2002
+++ /sys/src/cmd/5l/sched.c	Thu Jan  1 01:00:00 1970
@@ -1,645 +0,0 @@
-#include	"l.h"
-
-enum
-{
-	E_PSR	= 1<<0,
-	E_MEM	= 1<<3,
-	E_MEMSP	= 1<<4,		/* uses offset and size */
-	E_MEMSB	= 1<<5,		/* uses offset and size */
-	ANYMEM	= E_MEM|E_MEMSP|E_MEMSB,
-	DELAY	= BRANCH|LOAD|FCMP,
-};
-
-typedef	struct	Sch	Sch;
-typedef	struct	Dep	Dep;
-
-struct	Dep
-{
-	ulong	ireg;
-	ulong	freg;
-	ulong	cc;
-};
-struct	Sch
-{
-	Prog	p;
-	Dep	set;
-	Dep	used;
-	long	offset;
-	char	size;
-	char	nop;
-	char	comp;
-};
-
-void	regused(Sch*, Prog*);
-int	depend(Sch*, Sch*);
-int	conflict(Sch*, Sch*);
-int	offoverlap(Sch*, Sch*);
-void	dumpbits(Sch*, Dep*);
-
-void
-sched(Prog *p0, Prog *pe)
-{
-	Prog *p, *q;
-	Sch sch[NSCHED], *s, *t, *u, *se, stmp;
-
-	/*
-	 * build side structure
-	 */
-	s = sch;
-	for(p=p0;; p=p->link) {
-		memset(s, 0, sizeof(*s));
-		s->p = *p;
-		regused(s, p);
-		if(debug['X']) {
-			Bprint(&bso, "%P\t\tset", &s->p);
-			dumpbits(s, &s->set);
-			Bprint(&bso, "; used");
-			dumpbits(s, &s->used);
-			if(s->comp)
-				Bprint(&bso, "; compound");
-			if(s->p.mark & LOAD)
-				Bprint(&bso, "; load");
-			if(s->p.mark & BRANCH)
-				Bprint(&bso, "; branch");
-			if(s->p.mark & FCMP)
-				Bprint(&bso, "; fcmp");
-			Bprint(&bso, "\n");
-		}
-		if(p == pe)
-			break;
-		s++;
-	}
-	se = s;
-
-	/*
-	 * prepass to move things around
-	 * does nothing, but tries to make
-	 * the actual scheduler work better
-	 */
-	for(s=sch; s<=se; s++) {
-		if(!(s->p.mark & LOAD))
-			continue;
-		/* always good to put nonconflict loads together */
-		for(t=s+1; t<=se; t++) {
-			if(!(t->p.mark & LOAD))
-				continue;
-			if(t->p.mark & BRANCH)
-				break;
-			if(conflict(s, t))
-				break;
-			for(u=t-1; u>s; u--)
-				if(depend(u, t))
-					goto no11;
-			u = s+1;
-			stmp = *t;
-			memmove(s+2, u, (uchar*)t - (uchar*)u);
-			*u = stmp;
-			break;
-		}
-	no11:
-
-		/* put schedule fodder above load */
-		for(t=s+1; t<=se; t++) {
-			if(t->p.mark & BRANCH)
-				break;
-			if(s > sch && conflict(s-1, t))
-				continue;
-			for(u=t-1; u>=s; u--)
-				if(depend(t, u))
-					goto no1;
-			stmp = *t;
-			memmove(s+1, s, (uchar*)t - (uchar*)s);
-			*s = stmp;
-			if(!(s->p.mark & LOAD))
-				break;
-		no1:;
-		}
-	}
-
-	for(s=se; s>=sch; s--) {
-		if(!(s->p.mark & DELAY))
-			continue;
-		if(s < se)
-			if(!conflict(s, s+1))
-				goto out3;
-		/*
-		 * s is load, s+1 is immediate use of result or end of block
-		 * t is the trial instruction to insert between s and s+1
-		 */
-		if(!debug['Y'])
-		for(t=s-1; t>=sch; t--) {
-			if(t->comp)
-				if(s->p.mark & BRANCH)
-					goto no2;
-			if(t->p.mark & DELAY)
-				if(s >= se || conflict(t, s+1))
-					goto no2;
-			for(u=t+1; u<=s; u++)
-				if(depend(u, t))
-					goto no2;
-			goto out2;
-		no2:;
-		}
-		if(debug['X'])
-			Bprint(&bso, "?l%P\n", &s->p);
-		s->nop = 1;
-		if(debug['v']) {
-			if(s->p.mark & LOAD) {
-				nop.load.count++;
-				nop.load.outof++;
-			}
-			if(s->p.mark & BRANCH) {
-				nop.branch.count++;
-				nop.branch.outof++;
-			}
-			if(s->p.mark & FCMP) {
-				nop.fcmp.count++;
-				nop.fcmp.outof++;
-			}
-		}
-		continue;
-
-	out2:
-		if(debug['X']) {
-			Bprint(&bso, "!l%P\n", &t->p);
-			Bprint(&bso, "%P\n", &s->p);
-		}
-		stmp = *t;
-		memmove(t, t+1, (uchar*)s - (uchar*)t);
-		*s = stmp;
-		s--;
-
-	out3:
-		if(debug['v']) {
-			if(s->p.mark & LOAD)
-				nop.load.outof++;
-			if(s->p.mark & BRANCH)
-				nop.branch.outof++;
-			if(s->p.mark & FCMP)
-				nop.fcmp.outof++;
-		}
-	}
-
-	/* Avoid HI/LO use->set */
-	t = sch+1;
-	for(s=sch; s<se-1; s++, t++) {
-		if((s->used.cc & E_PSR) == 0)
-			continue;
-		if(t->set.cc & E_PSR)
-			s->nop = 2;
-	}
-
-	/*
-	 * put it all back
-	 */
-	for(s=sch, p=p0; s<=se; s++, p=q) {
-		q = p->link;
-		if(q != s->p.link) {
-			*p = s->p;
-			p->link = q;
-		}
-		while(s->nop--)
-			addnop(p);
-	}
-	if(debug['X']) {
-		Bprint(&bso, "\n");
-		Bflush(&bso);
-	}
-}
-
-void
-regused(Sch *s, Prog *realp)
-{
-	int c, ar, ad, ld, sz;
-	ulong m;
-	Prog *p;
-
-	p = &s->p;
-	s->comp = compound(p);
-	s->nop = 0;
-	if(s->comp) {
-		s->set.ireg |= 1<<REGTMP;
-		s->used.ireg |= 1<<REGTMP;
-	}
-
-	ar = 0;		/* dest is really reference */
-	ad = 0;		/* source/dest is really address */
-	ld = 0;		/* opcode is load instruction */
-	sz = 20;	/* size of load/store for overlap computation */
-
-/*
- * flags based on opcode
- */
-	switch(p->as) {
-	case ATEXT:
-		curtext = realp;
-		autosize = p->to.offset + 4;
-		ad = 1;
-		break;
-	case ABL:
-		c = p->reg;
-		if(c == NREG)
-			c = REGLINK;
-		s->set.ireg |= 1<<c;
-		ar = 1;
-		ad = 1;
-		break;
-	case ACMP:
-	case ACMPF:
-	case ACMPD:
-		ar = 1;
-		s->set.cc |= E_PSR;
-		p->mark |= FCMP;
-		break;
-	case AB:
-		ar = 1;
-		ad = 1;
-		break;
-	case AMOVB:
-	case AMOVBU:
-		sz = 1;
-		ld = 1;
-		break;
-	case AMOVH:
-	case AMOVHU:
-		sz = 2;
-		ld = 1;
-		break;
-	case AMOVF:
-	case AMOVW:
-		sz = 4;
-		ld = 1;
-		break;
-	case AMOVD:
-		sz = 8;
-		ld = 1;
-		break;
-	case ADIV:
-	case ADIVU:
-	case AMUL:
-	case AMULU:
-	case AMOD:
-	case AMODU:
-
-	case AADD:
-	case AAND:
-	case ANOR:
-	case AORR:
-	case ASLL:
-	case ASRA:
-	case ASRL:
-	case ASUB:
-	case AEOR:
-
-	case AADDD:
-	case AADDF:
-	case ASUBD:
-	case ASUBF:
-	case AMULF:
-	case AMULD:
-	case ADIVF:
-		if(p->reg == NREG) {
-			if(p->to.type == D_REG || p->to.type == D_FREG)
-				p->reg = p->to.reg;
-			if(p->reg == NREG)
-				print("botch %P\n", p);
-		}
-		break;
-	}
-
-/*
- * flags based on 'to' field
- */
-	c = p->to.class;
-	if(c == 0) {
-		c = aclass(&p->to) + 1;
-		p->to.class = c;
-	}
-	c--;
-	switch(c) {
-	default:
-		print("unknown class %d %D\n", c, &p->to);
-
-	case C_ZCON:
-	case C_ICON:
-	case C_SCON:
-	case C_SICON:
-	case C_LCON:
-	case C_NONE:
-	case C_SBRA:
-	case C_LBRA:
-		break;
-
-	case C_PSR:
-		s->set.cc |= E_PSR;
-		break;
-	case C_ZOREG:
-	case C_SOREG:
-	case C_LOREG:
-		c = p->to.reg;
-		s->used.ireg |= 1<<c;
-		if(ad)
-			break;
-		s->size = sz;
-		s->offset = regoff(&p->to);
-
-		m = ANYMEM;
-		if(c == REGSB)
-			m = E_MEMSB;
-		if(c == REGSP)
-			m = E_MEMSP;
-
-		if(ar)
-			s->used.cc |= m;
-		else
-			s->set.cc |= m;
-		break;
-	case C_SACON:
-	case C_LACON:
-		s->used.ireg |= 1<<REGSP;
-		break;
-	case C_SECON:
-	case C_LECON:
-		s->used.ireg |= 1<<REGSB;
-		break;
-	case C_REG:
-		if(ar)
-			s->used.ireg |= 1<<p->to.reg;
-		else
-			s->set.ireg |= 1<<p->to.reg;
-		break;
-	case C_REGREG:
-		if(ar){
-			s->used.ireg |= 1<<p->to.reg;
-			s->used.ireg |= 1<<p->to.offset;
-		}else{
-			s->set.ireg |= 1<<p->to.reg;
-			s->set.ireg |= 1<<p->to.offset;
-		}
-		break;
-	case C_FREG:
-		/* do better -- determine double prec */
-		if(ar) {
-			s->used.freg |= 1<<p->to.reg;
-			s->used.freg |= 1<<(p->to.reg|1);
-		} else {
-			s->set.freg |= 1<<p->to.reg;
-			s->set.freg |= 1<<(p->to.reg|1);
-		}
-		if(ld && p->from.type == D_REG)
-			p->mark |= LOAD;
-		break;
-	case C_SAUTO:
-	case C_LAUTO:
-		s->used.ireg |= 1<<REGSP;
-		if(ad)
-			break;
-		s->size = sz;
-		s->offset = regoff(&p->to);
-
-		if(ar)
-			s->used.cc |= E_MEMSP;
-		else
-			s->set.cc |= E_MEMSP;
-		break;
-	case C_SEXT:
-	case C_LEXT:
-		s->used.ireg |= 1<<REGSB;
-		if(ad)
-			break;
-		s->size = sz;
-		s->offset = regoff(&p->to);
-
-		if(ar)
-			s->used.cc |= E_MEMSB;
-		else
-			s->set.cc |= E_MEMSB;
-		break;
-	}
-
-/*
- * flags based on 'from' field
- */
-	c = p->from.class;
-	if(c == 0) {
-		c = aclass(&p->from) + 1;
-		p->from.class = c;
-	}
-	c--;
-	switch(c) {
-	default:
-		print("unknown class %d %D\n", c, &p->from);
-
-	case C_ZCON:
-	case C_ICON:
-	case C_SCON:
-	case C_SICON:
-	case C_LCON:
-	case C_NONE:
-	case C_SBRA:
-	case C_LBRA:
-		break;
-	case C_PSR:
-		s->used.cc |= E_PSR;
-		break;
-	case C_ZOREG:
-	case C_SOREG:
-	case C_LOREG:
-		c = p->from.reg;
-		s->used.ireg |= 1<<c;
-		if(ld)
-			p->mark |= LOAD;
-		s->size = sz;
-		s->offset = regoff(&p->from);
-
-		m = ANYMEM;
-		if(c == REGSB)
-			m = E_MEMSB;
-		if(c == REGSP)
-			m = E_MEMSP;
-
-		s->used.cc |= m;
-		break;
-	case C_SACON:
-	case C_LACON:
-		s->used.ireg |= 1<<REGSP;
-		break;
-	case C_SECON:
-	case C_LECON:
-		s->used.ireg |= 1<<REGSB;
-		break;
-	case C_REG:
-		s->used.ireg |= 1<<p->from.reg;
-		break;
-	case C_REGREG:
-		s->used.ireg |= 1<<p->from.reg;
-		s->used.ireg |= 1<<p->from.offset;
-		break;
-	case C_FREG:
-		/* do better -- determine double prec */
-		s->used.freg |= 1<<p->from.reg;
-		s->used.freg |= 1<<(p->from.reg|1);
-		if(ld && p->to.type == D_REG)
-			p->mark |= LOAD;
-		break;
-	case C_SAUTO:
-	case C_LAUTO:
-		s->used.ireg |= 1<<REGSP;
-		if(ld)
-			p->mark |= LOAD;
-		if(ad)
-			break;
-		s->size = sz;
-		s->offset = regoff(&p->from);
-
-		s->used.cc |= E_MEMSP;
-		break;
-	case C_SEXT:
-	case C_LEXT:
-		s->used.ireg |= 1<<REGSB;
-		if(ld)
-			p->mark |= LOAD;
-		if(ad)
-			break;
-		s->size = sz;
-		s->offset = regoff(&p->from);
-
-		s->used.cc |= E_MEMSB;
-		break;
-	}
-
-	c = p->reg;
-	if(c != NREG) {
-		if(p->from.type == D_FREG || p->to.type == D_FREG) {
-			s->used.freg |= 1<<c;
-			s->used.freg |= 1<<(c|1);
-		} else
-			s->used.ireg |= 1<<c;
-	}
-}
-
-/*
- * test to see if 2 instrictions can be
- * interchanged without changing semantics
- */
-int
-depend(Sch *sa, Sch *sb)
-{
-	ulong x;
-
-	if(sa->set.ireg & (sb->set.ireg|sb->used.ireg))
-		return 1;
-	if(sb->set.ireg & sa->used.ireg)
-		return 1;
-
-	if(sa->set.freg & (sb->set.freg|sb->used.freg))
-		return 1;
-	if(sb->set.freg & sa->used.freg)
-		return 1;
-
-	/*
-	 * special case.
-	 * loads from same address cannot pass.
-	 * this is for hardware fifo's and the like
-	 */
-	if(sa->used.cc & sb->used.cc & E_MEM)
-		if(sa->p.reg == sb->p.reg)
-		if(regoff(&sa->p.from) == regoff(&sb->p.from))
-			return 1;
-
-	x = (sa->set.cc & (sb->set.cc|sb->used.cc)) |
-		(sb->set.cc & sa->used.cc);
-	if(x) {
-		/*
-		 * allow SB and SP to pass each other.
-		 * allow SB to pass SB iff doffsets are ok
-		 * anything else conflicts
-		 */
-		if(x != E_MEMSP && x != E_MEMSB)
-			return 1;
-		x = sa->set.cc | sb->set.cc |
-			sa->used.cc | sb->used.cc;
-		if(x & E_MEM)
-			return 1;
-		if(offoverlap(sa, sb))
-			return 1;
-	}
-
-	return 0; 
-}
-
-int
-offoverlap(Sch *sa, Sch *sb)
-{
-
-	if(sa->offset < sb->offset) {
-		if(sa->offset+sa->size > sb->offset)
-			return 1;
-		return 0;
-	}
-	if(sb->offset+sb->size > sa->offset)
-		return 1;
-	return 0;
-}
-
-/*
- * test 2 adjacent instructions
- * and find out if inserted instructions
- * are desired to prevent stalls.
- */
-int
-conflict(Sch *sa, Sch *sb)
-{
-
-	if(sa->set.ireg & sb->used.ireg)
-		return 1;
-	if(sa->set.freg & sb->used.freg)
-		return 1;
-	if(sa->set.cc & sb->used.cc)
-		return 1;
-
-	return 0;
-}
-
-int
-compound(Prog *p)
-{
-	Optab *o;
-
-	o = oplook(p);
-	if(o->size != 4)
-		return 1;
-	if(p->to.type == D_REG && p->to.reg == REGSB)
-		return 1;
-	return 0;
-}
-
-void
-dumpbits(Sch *s, Dep *d)
-{
-	int i;
-
-	for(i=0; i<32; i++)
-		if(d->ireg & (1<<i))
-			Bprint(&bso, " R%d", i);
-	for(i=0; i<32; i++)
-		if(d->freg & (1<<i))
-			Bprint(&bso, " F%d", i);
-	for(i=0; i<32; i++)
-		switch(d->cc & (1<<i)) {
-		default:
-			break;
-		case E_PSR:
-			Bprint(&bso, " PSR");
-			break;
-		case E_MEM:
-			Bprint(&bso, " MEM%d", s->size);
-			break;
-		case E_MEMSB:
-			Bprint(&bso, " SB%d", s->size);
-			break;
-		case E_MEMSP:
-			Bprint(&bso, " SP%d", s->size);
-			break;
-		}
-}
--- /sys/src/cmd/6c/cgen.c	Wed Jul  4 14:47:22 2012
+++ /sys/src/cmd/6c/cgen.c	Thu Feb 28 20:10:56 2013
@@ -2,6 +2,7 @@
 
 /* ,x/^(print|prtree)\(/i/\/\/ */
 int castup(Type*, Type*);
+void checkmask(Node*, Node*);
 
 void
 cgen(Node *n, Node *nn)
@@ -257,6 +258,8 @@
 				break;
 			}
 		}
+		if(n->op == OAND)
+			checkmask(n, r);
 		if(r->addable >= INDEXED && !hardconst(r)) {
 			regalloc(&nod, l, nn);
 			cgen(l, &nod);
@@ -521,6 +524,8 @@
 			goto asbitop;
 		if(typefd[l->type->etype] || typefd[r->type->etype])
 			goto asfop;
+		if(o == OASAND)
+			checkmask(n, r);
 		if(l->complex >= r->complex) {
 			if(hardleft)
 				reglcgen(&nod, l, Z);
@@ -1596,7 +1601,7 @@
 		regsalloc(&nod2, nn);
 		nn->type = t;
 
-		gins(AMOVL, &nod1, &nod2);
+		gins(AMOVQ, &nod1, &nod2);
 		regfree(&nod1);
 
 		nod2.type = typ(TIND, t);
@@ -1697,7 +1702,7 @@
 	c = 0;
 	if(n->complex > nn->complex) {
 		t = n->type;
-		n->type = types[TLONG];
+		n->type = types[TIND];
 		nodreg(&nod1, n, D_SI);
 		if(reg[D_SI]) {
 			gins(APUSHQ, &nod1, Z);
@@ -1708,7 +1713,7 @@
 		n->type = t;
 
 		t = nn->type;
-		nn->type = types[TLONG];
+		nn->type = types[TIND];
 		nodreg(&nod2, nn, D_DI);
 		if(reg[D_DI]) {
 warn(Z, "DI botch");
@@ -1720,7 +1725,7 @@
 		nn->type = t;
 	} else {
 		t = nn->type;
-		nn->type = types[TLONG];
+		nn->type = types[TIND];
 		nodreg(&nod2, nn, D_DI);
 		if(reg[D_DI]) {
 warn(Z, "DI botch");
@@ -1732,7 +1737,7 @@
 		nn->type = t;
 
 		t = n->type;
-		n->type = types[TLONG];
+		n->type = types[TIND];
 		nodreg(&nod1, n, D_SI);
 		if(reg[D_SI]) {
 			gins(APUSHQ, &nod1, Z);
@@ -1861,6 +1866,22 @@
 		return ft == TULONG || ft == TUINT || ft == TUSHORT;
 	}
 	return 0;
+}
+
+/*
+ * vl &= ~ul or vl & ~ul
+ * create a ul mask with top bits zero, which is usually wrong
+ */
+void
+checkmask(Node *n, Node *r)
+{
+	Node *rl;
+
+	if((n->op == OAND || n->op == OASAND) &&
+	   r->op == OCAST &&
+	   (rl = r->left)->op == OCOM &&
+	   typesuv[n->type->etype] && typeu[rl->type->etype] && typechl[rl->type->etype])
+		warn(n, "32-bit mask zero-extended to 64 bits");
 }
 
 void
--- /sys/src/cmd/aquarela/smbcommon.c	Thu Dec 29 22:35:11 2005
+++ /sys/src/cmd/aquarela/smbcommon.c	Thu Feb 28 20:13:42 2013
@@ -290,7 +290,7 @@
 vlong
 smbl2roundupvlong(vlong v, int l2)
 {
-	ulong mask;
+	uvlong mask;
 	mask = (1 << l2) - 1;
 	return (v + mask) & ~mask;
 }
--- /sys/src/cmd/aux/ms2.c	Wed Aug 17 20:57:36 2005
+++ /sys/src/cmd/aux/ms2.c	Thu Feb 28 20:14:35 2013
@@ -18,7 +18,7 @@
 int	halfswap;
 int	srec = 2;
 uvlong	addr;
-ulong 	psize = 4096;
+uvlong 	psize = 4096;
 Biobuf 	stdout;
 Fhdr	exech;
 Biobuf *bio;
--- /sys/src/cmd/plumb/fsys.c	Thu Feb 28 21:07:17 2002
+++ /sys/src/cmd/plumb/fsys.c	Thu Feb 21 22:17:33 2013
@@ -10,7 +10,7 @@
 
 enum
 {
-	Stack = 8*1024
+	Stack = 16*1024
 };
 
 typedef struct Dirtab Dirtab;
--- /sys/src/cmd/rc/compiling.on.unix	Sat Dec 20 02:46:13 2003
+++ /sys/src/cmd/rc/compiling.on.unix	Thu Jan  1 01:00:00 1970
@@ -1,1866 +0,0 @@
-From geoff@collyer.net Fri Dec 19 01:21:40 EST 2003
-Received: from plan9.cs.bell-labs.com ([135.104.9.2]) by plan9; Fri Dec 19 01:21:39 EST 2003
-Received: from collyer.net ([63.192.14.226]) by plan9; Fri Dec 19 01:21:35 EST 2003
-Message-ID: <c790d8b1e06b3918ad2c7848a3ae0ec7@collyer.net>
-subject: rc on unix, part 1
-From: Geoff Collyer <geoff@collyer.net>
-Date: Thu, 18 Dec 2003 22:21:33 -0800
-To: presotto@plan9.bell-labs.com, rsc@plan9.bell-labs.com, geoff@collyer.net
-MIME-Version: 1.0
-Content-Type: text/plain; charset="US-ASCII"
-Content-Transfer-Encoding: 7bit
-
-I got /sys/src/cmd/rc to compile under APE (in preparation for moving it
-to Unixes) with the following changed files.  I cadged some include files
-from rsc but had to edit lib9.h slightly.  I'll send the include files
-separately.  I can't tell if it works yet, but it does complain about
-/usr/lib/rcmain being absent when I start it.  Oh, and I haven't yet
-simulated the effect of the OCEXEC bit.
-
-
-# To unbundle, run this file
-echo mkfile
-sed 's/^X//' >mkfile <<'!'
-X</$objtype/mkfile
-
-TARG=rc
-COMMONOFILES=\
-X	code.$O\
-X	exec.$O\
-X	getflags.$O\
-X	glob.$O\
-X	here.$O\
-X	io.$O\
-X	lex.$O\
-X	pcmd.$O\
-X	pfnc.$O\
-X	simple.$O\
-X	subr.$O\
-X	trap.$O\
-X	tree.$O\
-X	var.$O\
-X	havefork.$O\
-
-PLAN9OFILES=plan9.$O\
-
-UNIXOFILES=unix.$O\
-
-OFILES=$COMMONOFILES $UNIXOFILES y.tab.$O
-
-HFILES=rc.h\
-X	x.tab.h\
-X	io.h\
-X	exec.h\
-X	fns.h\
-
-YFILES=syn.y
-
-BIN=/$objtype/bin
-
-UPDATE=\
-X	mkfile\
-X	$HFILES\
-X	${COMMONOFILES:%.$O=%.c}\
-X	${UNIXOFILES:%.$O=%.c}\
-X	${PLAN9OFILES:%.$O=%.c}\
-X	$YFILES\
-X	${TARG:%=/386/bin/%}\
-
-CC=pcc -c -B -I../include
-LD=pcc
-
-X</sys/src/cmd/mkone
-
-x.tab.h: y.tab.h
-X	cmp -s x.tab.h y.tab.h || cp y.tab.h x.tab.h
-
-clean:V:
-X	rm -f [$OS].out *.[$OS] [xy].tab.? y.debug $TARG
-
-regress: $O.out
-X	cd test
-X	mk
-
-unregress:V:
-X	for(test in test/*.test) rc $test >$test.out
-
-listing:
-X	pr mkfile $HFILES $FILES $FILES9 $FILESUNIX $YFILES|lp -du
-!
-echo simple.c
-sed 's/^X//' >simple.c <<'!'
-X/*
-X * Maybe `simple' is a misnomer.
-X */
-X#include "rc.h"
-X#include "getflags.h"
-X#include "exec.h"
-X#include "io.h"
-X#include "fns.h"
-X/*
-X * Search through the following code to see if we're just going to exit.
-X */
-exitnext(void){
-X	union code *c=&runq->code[runq->pc];
-X	while(c->f==Xpopredir) c++;
-X	return c->f==Xexit;
-X}
-
-void
-XXsimple(void)
-X{
-X	word *a;
-X	thread *p = runq;
-X	var *v;
-X	struct builtin *bp;
-X	int pid;
-X	globlist();
-X	a = runq->argv->words;
-X	if(a==0){
-X		Xerror1("empty argument list");
-X		return;
-X	}
-X	if(flag['x'])
-X		pfmt(err, "%v\n", p->argv->words); /* wrong, should do redirs */
-X	v = gvlook(a->word);
-X	if(v->fn)
-X		execfunc(v);
-X	else{
-X		if(strcmp(a->word, "builtin")==0){
-X			if(count(a)==1){
-X				pfmt(err, "builtin: empty argument list\n");
-X				setstatus("empty arg list");
-X				poplist();
-X				return;
-X			}
-X			a = a->next;
-X			popword();
-X		}
-X		for(bp = Builtin;bp->name;bp++)
-X			if(strcmp(a->word, bp->name)==0){
-X				(*bp->fnc)();
-X				return;
-X			}
-X		if(exitnext()){
-X			/* fork and wait is redundant */
-X			pushword("exec");
-X			execexec();
-X			Xexit();
-X		}
-X		else{
-X			flush(err);
-X			Updenv();	/* necessary so changes don't go out again */
-X			if((pid = execforkexec()) < 0){
-X				Xerror("try again");
-X				return;
-X			}
-
-X			/* interrupts don't get us out */
-X			poplist();
-X			while(Waitfor(pid, 1) < 0)
-X				;
-X		}
-X	}
-X}
-struct word nullpath = { "", 0};
-
-void
-doredir(redir *rp)
-X{
-X	if(rp){
-X		doredir(rp->next);
-X		switch(rp->type){
-X		case ROPEN:
-X			if(rp->from!=rp->to){
-X				Dup(rp->from, rp->to);
-X				close(rp->from);
-X			}
-X			break;
-X		case RDUP:
-X			Dup(rp->from, rp->to);
-X			break;
-X		case RCLOSE:
-X			close(rp->from);
-X			break;
-X		}
-X	}
-X}
-
-word*
-searchpath(char *w)
-X{
-X	word *path;
-X	if(strncmp(w, "/", 1)==0
-X	|| strncmp(w, "#", 1)==0
-X	|| strncmp(w, "./", 2)==0
-X	|| strncmp(w, "../", 3)==0
-X	|| (path = vlook("path")->val)==0)
-X		path=&nullpath;
-X	return path;
-X}
-
-void
-execexec(void)
-X{
-X	popword();	/* "exec" */
-X	if(runq->argv->words==0){
-X		Xerror1("empty argument list");
-X		return;
-X	}
-X	doredir(runq->redir);
-X	Execute(runq->argv->words, searchpath(runq->argv->words->word));
-X	poplist();
-X}
-
-void
-execfunc(var *func)
-X{
-X	word *starval;
-X	popword();
-X	starval = runq->argv->words;
-X	runq->argv->words = 0;
-X	poplist();
-X	start(func->fn, func->pc, (struct var *)0);
-X	runq->local = newvar(strdup("*"), runq->local);
-X	runq->local->val = starval;
-X	runq->local->changed = 1;
-X}
-
-int
-dochdir(char *word)
-X{
-X	/* report to /dev/wdir if it exists and we're interactive */
-X	static int wdirfd = -2;
-X	if(chdir(word)<0) return -1;
-X	if(flag['i']!=0){
-X		if(wdirfd==-2)	/* try only once */
-X			/* TODO: arrange close-on-exec on Unix */
-X			wdirfd = open("/dev/wdir", OWRITE|OCEXEC);
-X		if(wdirfd>=0)
-X			write(wdirfd, word, strlen(word));
-X	}
-X	return 1;
-X}
-
-void
-execcd(void)
-X{
-X	word *a = runq->argv->words;
-X	word *cdpath;
-X	char dir[512];
-X	setstatus("can't cd");
-X	cdpath = vlook("cdpath")->val;
-X	switch(count(a)){
-X	default:
-X		pfmt(err, "Usage: cd [directory]\n");
-X		break;
-X	case 2:
-X		if(a->next->word[0]=='/' || cdpath==0)
-X			cdpath=&nullpath;
-X		for(;cdpath;cdpath = cdpath->next){
-X			strcpy(dir, cdpath->word);
-X			if(dir[0])
-X				strcat(dir, "/");
-X			strcat(dir, a->next->word);
-X			if(dochdir(dir)>=0){
-X				if(strlen(cdpath->word)
-X				&& strcmp(cdpath->word, ".")!=0)
-X					pfmt(err, "%s\n", dir);
-X				setstatus("");
-X				break;
-X			}
-X		}
-X		if(cdpath==0)
-X			pfmt(err, "Can't cd %s: %r\n", a->next->word);
-X		break;
-X	case 1:
-X		a = vlook("home")->val;
-X		if(count(a)>=1){
-X			if(dochdir(a->word)>=0)
-X				setstatus("");
-X			else
-X				pfmt(err, "Can't cd %s: %r\n", a->word);
-X		}
-X		else
-X			pfmt(err, "Can't cd -- $home empty\n");
-X		break;
-X	}
-X	poplist();
-X}
-
-void
-execexit(void)
-X{
-X	switch(count(runq->argv->words)){
-X	default:
-X		pfmt(err, "Usage: exit [status]\nExiting anyway\n");
-X	case 2:
-X		setstatus(runq->argv->words->next->word);
-X	case 1:	Xexit();
-X	}
-X}
-
-void
-execshift(void)
-X{
-X	int n;
-X	word *a;
-X	var *star;
-X	switch(count(runq->argv->words)){
-X	default:
-X		pfmt(err, "Usage: shift [n]\n");
-X		setstatus("shift usage");
-X		poplist();
-X		return;
-X	case 2:
-X		n = atoi(runq->argv->words->next->word);
-X		break;
-X	case 1:
-X		n = 1;
-X		break;
-X	}
-X	star = vlook("*");
-X	for(;n && star->val;--n){
-X		a = star->val->next;
-X		efree(star->val->word);
-X		efree((char *)star->val);
-X		star->val = a;
-X		star->changed = 1;
-X	}
-X	setstatus("");
-X	poplist();
-X}
-
-int
-octal(char *s)
-X{
-X	int n = 0;
-X	while(*s==' ' || *s=='\t' || *s=='\n') s++;
-X	while('0'<=*s && *s<='7') n = n*8+*s++-'0';
-X	return n;
-X}
-
-int
-mapfd(int fd)
-X{
-X	redir *rp;
-X	for(rp = runq->redir;rp;rp = rp->next){
-X		switch(rp->type){
-X		case RCLOSE:
-X			if(rp->from==fd)
-X				fd=-1;
-X			break;
-X		case RDUP:
-X		case ROPEN:
-X			if(rp->to==fd)
-X				fd = rp->from;
-X			break;
-X		}
-X	}
-X	return fd;
-X}
-union code rdcmds[4];
-
-void
-execcmds(io *f)
-X{
-X	static int first = 1;
-X	if(first){
-X		rdcmds[0].i = 1;
-X		rdcmds[1].f = Xrdcmds;
-X		rdcmds[2].f = Xreturn;
-X		first = 0;
-X	}
-X	start(rdcmds, 1, runq->local);
-X	runq->cmdfd = f;
-X	runq->iflast = 0;
-X}
-
-void
-execeval(void)
-X{
-X	char *cmdline, *s, *t;
-X	int len = 0;
-X	word *ap;
-X	if(count(runq->argv->words)<=1){
-X		Xerror1("Usage: eval cmd ...");
-X		return;
-X	}
-X	eflagok = 1;
-X	for(ap = runq->argv->words->next;ap;ap = ap->next)
-X		len+=1+strlen(ap->word);
-X	cmdline = emalloc(len);
-X	s = cmdline;
-X	for(ap = runq->argv->words->next;ap;ap = ap->next){
-X		for(t = ap->word;*t;) *s++=*t++;
-X		*s++=' ';
-X	}
-X	s[-1]='\n';
-X	poplist();
-X	execcmds(opencore(cmdline, len));
-X	efree(cmdline);
-X}
-union code dotcmds[14];
-
-void
-execdot(void)
-X{
-X	int iflag = 0;
-X	int fd;
-X	list *av;
-X	thread *p = runq;
-X	char *zero;
-X	static int first = 1;
-X	char file[512];
-X	word *path;
-X	if(first){
-X		dotcmds[0].i = 1;
-X		dotcmds[1].f = Xmark;
-X		dotcmds[2].f = Xword;
-X		dotcmds[3].s="0";
-X		dotcmds[4].f = Xlocal;
-X		dotcmds[5].f = Xmark;
-X		dotcmds[6].f = Xword;
-X		dotcmds[7].s="*";
-X		dotcmds[8].f = Xlocal;
-X		dotcmds[9].f = Xrdcmds;
-X		dotcmds[10].f = Xunlocal;
-X		dotcmds[11].f = Xunlocal;
-X		dotcmds[12].f = Xreturn;
-X		first = 0;
-X	}
-X	else
-X		eflagok = 1;
-X	popword();
-X	if(p->argv->words && strcmp(p->argv->words->word, "-i")==0){
-X		iflag = 1;
-X		popword();
-X	}
-X	/* get input file */
-X	if(p->argv->words==0){
-X		Xerror1("Usage: . [-i] file [arg ...]");
-X		return;
-X	}
-X	zero = strdup(p->argv->words->word);
-X	popword();
-X	fd=-1;
-X	for(path = searchpath(zero);path;path = path->next){
-X		strcpy(file, path->word);
-X		if(file[0])
-X			strcat(file, "/");
-X		strcat(file, zero);
-X		if((fd = open(file, 0))>=0) break;
-X		if(strcmp(file, "/dev/stdin")==0){	/* for sun & ucb */
-X			fd = Dup1(0);
-X			if(fd>=0)
-X				break;
-X		}
-X	}
-X	if(fd<0){
-X		pfmt(err, "%s: ", zero);
-X		setstatus("can't open");
-X		Xerror(".: can't open");
-X		return;
-X	}
-X	/* set up for a new command loop */
-X	start(dotcmds, 1, (struct var *)0);
-X	pushredir(RCLOSE, fd, 0);
-X	runq->cmdfile = zero;
-X	runq->cmdfd = openfd(fd);
-X	runq->iflag = iflag;
-X	runq->iflast = 0;
-X	/* push $* value */
-X	pushlist();
-X	runq->argv->words = p->argv->words;
-X	/* free caller's copy of $* */
-X	av = p->argv;
-X	p->argv = av->next;
-X	efree((char *)av);
-X	/* push $0 value */
-X	pushlist();
-X	pushword(zero);
-X	ndot++;
-X}
-
-void
-execflag(void)
-X{
-X	char *letter, *val;
-X	switch(count(runq->argv->words)){
-X	case 2:
-X		setstatus(flag[runq->argv->words->next->word[0]]?"":"flag not set");
-X		break;
-X	case 3:
-X		letter = runq->argv->words->next->word;
-X		val = runq->argv->words->next->next->word;
-X		if(strlen(letter)==1){
-X			if(strcmp(val, "+")==0){
-X				flag[letter[0]] = flagset;
-X				break;
-X			}
-X			if(strcmp(val, "-")==0){
-X				flag[letter[0]] = 0;
-X				break;
-X			}
-X		}
-X	default:
-X		Xerror1("Usage: flag [letter] [+-]");
-X		return;
-X	}
-X	poplist();
-X}
-
-void
-execwhatis(void){	/* mildly wrong -- should fork before writing */
-X	word *a, *b, *path;
-X	var *v;
-X	struct builtin *bp;
-X	char file[512];
-X	struct io out[1];
-X	int found, sep;
-X	a = runq->argv->words->next;
-X	if(a==0){
-X		Xerror1("Usage: whatis name ...");
-X		return;
-X	}
-X	setstatus("");
-X	out->fd = mapfd(1);
-X	out->bufp = out->buf;
-X	out->ebuf = &out->buf[NBUF];
-X	out->strp = 0;
-X	for(;a;a = a->next){
-X		v = vlook(a->word);
-X		if(v->val){
-X			pfmt(out, "%s=", a->word);
-X			if(v->val->next==0)
-X				pfmt(out, "%q\n", v->val->word);
-X			else{
-X				sep='(';
-X				for(b = v->val;b && b->word;b = b->next){
-X					pfmt(out, "%c%q", sep, b->word);
-X					sep=' ';
-X				}
-X				pfmt(out, ")\n");
-X			}
-X			found = 1;
-X		}
-X		else
-X			found = 0;
-X		v = gvlook(a->word);
-X		if(v->fn)
-X			pfmt(out, "fn %s %s\n", v->name, v->fn[v->pc-1].s);
-X		else{
-X			for(bp = Builtin;bp->name;bp++)
-X				if(strcmp(a->word, bp->name)==0){
-X					pfmt(out, "builtin %s\n", a->word);
-X					break;
-X				}
-X			if(!bp->name){
-X				for(path = searchpath(a->word);path;path = path->next){
-X					strcpy(file, path->word);
-X					if(file[0])
-X						strcat(file, "/");
-X					strcat(file, a->word);
-X					if(Executable(file)){
-X						pfmt(out, "%s\n", file);
-X						break;
-X					}
-X				}
-X				if(!path && !found){
-X					pfmt(err, "%s: not found\n", a->word);
-X					setstatus("not found");
-X				}
-X			}
-X		}
-X	}
-X	poplist();
-X	flush(err);
-X}
-
-void
-execwait(void)
-X{
-X	switch(count(runq->argv->words)){
-X	default:
-X		Xerror1("Usage: wait [pid]");
-X		return;
-X	case 2:
-X		Waitfor(atoi(runq->argv->words->next->word), 0);
-X		break;
-X	case 1:
-X		Waitfor(-1, 0);
-X		break;
-X	}
-X	poplist();
-X}
-!
-echo havefork.c
-sed 's/^X//' >havefork.c <<'!'
-X#include "rc.h"
-X#include "getflags.h"
-X#include "exec.h"
-X#include "io.h"
-X#include "fns.h"
-
-int havefork = 1;
-
-void
-XXasync(void)
-X{
-X	int null = open("/dev/null", 0);
-X	int pid;
-X	char npid[10];
-X	if(null<0){
-X		Xerror("Can't open /dev/null\n");
-X		return;
-X	}
-X#ifdef Unix
-X	pid = fork();
-X#else
-X	pid = rfork(RFFDG|RFPROC|RFNOTEG);
-X#endif
-X	switch(pid){
-X	case -1:
-X		close(null);
-X		Xerror("try again");
-X		break;
-X	case 0:
-X		pushredir(ROPEN, null, 0);
-X		start(runq->code, runq->pc+1, runq->local);
-X		runq->ret = 0;
-X		break;
-X	default:
-X		close(null);
-X		runq->pc = runq->code[runq->pc].i;
-X		inttoascii(npid, pid);
-X		setvar("apid", newword(npid, (word *)0));
-X		break;
-X	}
-X}
-
-void
-XXpipe(void)
-X{
-X	struct thread *p = runq;
-X	int pc = p->pc, forkid;
-X	int lfd = p->code[pc++].i;
-X	int rfd = p->code[pc++].i;
-X	int pfd[2];
-X	if(pipe(pfd)<0){
-X		Xerror("can't get pipe");
-X		return;
-X	}
-X	switch(forkid = fork()){
-X	case -1:
-X		Xerror("try again");
-X		break;
-X	case 0:
-X		start(p->code, pc+2, runq->local);
-X		runq->ret = 0;
-X		close(pfd[PRD]);
-X		pushredir(ROPEN, pfd[PWR], lfd);
-X		break;
-X	default:
-X		start(p->code, p->code[pc].i, runq->local);
-X		close(pfd[PWR]);
-X		pushredir(ROPEN, pfd[PRD], rfd);
-X		p->pc = p->code[pc+1].i;
-X		p->pid = forkid;
-X		break;
-X	}
-X}
-
-X/*
-X * Who should wait for the exit from the fork?
-X */
-void
-XXbackq(void)
-X{
-X	char wd[8193];
-X	int c;
-X	char *s, *ewd=&wd[8192], *stop;
-X	struct io *f;
-X	var *ifs = vlook("ifs");
-X	word *v, *nextv;
-X	int pfd[2];
-X	int pid;
-X	stop = ifs->val?ifs->val->word:"";
-X	if(pipe(pfd)<0){
-X		Xerror("can't make pipe");
-X		return;
-X	}
-X	switch(pid = fork()){
-X	case -1:
-X		Xerror("try again");
-X		close(pfd[PRD]);
-X		close(pfd[PWR]);
-X		return;
-X	case 0:
-X		close(pfd[PRD]);
-X		start(runq->code, runq->pc+1, runq->local);
-X		pushredir(ROPEN, pfd[PWR], 1);
-X		return;
-X	default:
-X		close(pfd[PWR]);
-X		f = openfd(pfd[PRD]);
-X		s = wd;
-X		v = 0;
-X		while((c = rchr(f))!=EOF){
-X			if(strchr(stop, c) || s==ewd){
-X				if(s!=wd){
-X					*s='\0';
-X					v = newword(wd, v);
-X					s = wd;
-X				}
-X			}
-X			else *s++=c;
-X		}
-X		if(s!=wd){
-X			*s='\0';
-X			v = newword(wd, v);
-X		}
-X		closeio(f);
-X		Waitfor(pid, 0);
-X		/* v points to reversed arglist -- reverse it onto argv */
-X		while(v){
-X			nextv = v->next;
-X			v->next = runq->argv->words;
-X			runq->argv->words = v;
-X			v = nextv;
-X		}
-X		runq->pc = runq->code[runq->pc].i;
-X		return;
-X	}
-X}
-
-void
-XXpipefd(void)
-X{
-X	struct thread *p = runq;
-X	int pc = p->pc;
-X	char name[40];
-X	int pfd[2];
-X	int sidefd, mainfd;
-X	if(pipe(pfd)<0){
-X		Xerror("can't get pipe");
-X		return;
-X	}
-X	if(p->code[pc].i==READ){
-X		sidefd = pfd[PWR];
-X		mainfd = pfd[PRD];
-X	}
-X	else{
-X		sidefd = pfd[PRD];
-X		mainfd = pfd[PWR];
-X	}
-X	switch(fork()){
-X	case -1:
-X		Xerror("try again");
-X		break;
-X	case 0:
-X		start(p->code, pc+2, runq->local);
-X		close(mainfd);
-X		pushredir(ROPEN, sidefd, p->code[pc].i==READ?1:0);
-X		runq->ret = 0;
-X		break;
-X	default:
-X		close(sidefd);
-X		pushredir(ROPEN, mainfd, mainfd);	/* isn't this a noop? */
-X		strcpy(name, Fdprefix);
-X		inttoascii(name+strlen(name), mainfd);
-X		pushword(name);
-X		p->pc = p->code[pc+1].i;
-X		break;
-X	}
-X}
-
-void
-XXsubshell(void)
-X{
-X	int pid;
-X	switch(pid = fork()){
-X	case -1:
-X		Xerror("try again");
-X		break;
-X	case 0:
-X		start(runq->code, runq->pc+1, runq->local);
-X		runq->ret = 0;
-X		break;
-X	default:
-X		Waitfor(pid, 1);
-X		runq->pc = runq->code[runq->pc].i;
-X		break;
-X	}
-X}
-
-int
-execforkexec(void)
-X{
-X	int pid;
-X	int n;
-X	char buf[ERRMAX];
-
-X	switch(pid = fork()){
-X	case -1:
-X		return -1;
-X	case 0:
-X		pushword("exec");
-X		execexec();
-X		strcpy(buf, "can't exec: ");
-X		n = strlen(buf);
-X		errstr(buf+n, ERRMAX-n);
-X		Exit(buf);
-X	}
-X	return pid;
-X}
-!
-echo rc.h
-sed 's/^X//' >rc.h <<'!'
-X/*
-X * Plan9 is defined for plan 9
-X * V9 is defined for 9th edition
-X * Sun is defined for sun-os
-X * Please don't litter the code with ifdefs.  The three below should be enough.
-X */
-X#define Unix
-
-X#ifdef	Plan9
-X#include <u.h>
-X#include <libc.h>
-X#define	NSIG	32
-X#define	SIGINT	2
-X#define	SIGQUIT	3
-X#endif
-
-X#ifdef Unix
-X#define _POSIX_SOURCE
-X#define _BSD_EXTENSION
-
-X#include <stdlib.h>
-X#include <stdarg.h>
-X#include <string.h>
-X#include <unistd.h>
-X#include <fcntl.h>
-X#include <lib9.h>
-X#include <signal.h>
-X#endif
-
-X#ifndef ERRMAX
-X#define ERRMAX 128
-X#endif
-
-X#define	YYMAXDEPTH	500
-X#ifndef PAREN
-X#include "x.tab.h"
-X#endif
-typedef struct tree tree;
-typedef struct word word;
-typedef struct io io;
-typedef union code code;
-typedef struct var var;
-typedef struct list list;
-typedef struct redir redir;
-typedef struct thread thread;
-typedef struct builtin builtin;
-
-struct tree{
-X	int type;
-X	int rtype, fd0, fd1;		/* details of REDIR PIPE DUP tokens */
-X	char *str;
-X	int quoted;
-X	int iskw;
-X	tree *child[3];
-X	tree *next;
-X};
-tree *newtree(void);
-tree *token(char*, int), *klook(char*), *tree1(int, tree*);
-tree *tree2(int, tree*, tree*), *tree3(int, tree*, tree*, tree*);
-tree *mung1(tree*, tree*), *mung2(tree*, tree*, tree*);
-tree *mung3(tree*, tree*, tree*, tree*), *epimung(tree*, tree*);
-tree *simplemung(tree*), *heredoc(tree*);
-void freetree(tree*);
-tree *cmdtree;
-X/*
-X * The first word of any code vector is a reference count.
-X * Always create a new reference to a code vector by calling codecopy(.).
-X * Always call codefree(.) when deleting a reference.
-X */
-union code{
-X	void (*f)(void);
-X	int i;
-X	char *s;
-X};
-char *promptstr;
-int doprompt;
-X#define	NTOK	8192
-char tok[NTOK];
-X#define	APPEND	1
-X#define	WRITE	2
-X#define	READ	3
-X#define	HERE	4
-X#define	DUPFD	5
-X#define	CLOSE	6
-struct var{
-X	char *name;		/* ascii name */
-X	word *val;	/* value */
-X	int changed;
-X	code *fn;		/* pointer to function's code vector */
-X	int fnchanged;
-X	int pc;			/* pc of start of function */
-X	var *next;	/* next on hash or local list */
-X};
-var *vlook(char*), *gvlook(char*), *newvar(char*, var*);
-X#define	NVAR	521
-var *gvar[NVAR];				/* hash for globals */
-X#define	new(type)	((type *)emalloc(sizeof(type)))
-char *emalloc(long);
-void *Malloc(ulong);
-void efree(char*);
-X#define	NOFILE	128		/* should come from <param.h> */
-struct here{
-X	tree *tag;
-X	char *name;
-X	struct here *next;
-X};
-int mypid;
-X/*
-X * Glob character escape in strings:
-X *	In a string, GLOB must be followed by *?[ or GLOB.
-X *	GLOB* matches any string
-X *	GLOB? matches any single character
-X *	GLOB[...] matches anything in the brackets
-X *	GLOBGLOB matches GLOB
-X */
-X#define	GLOB	((char)0x01)
-X/*
-X * onebyte(c), twobyte(c), threebyte(c)
-X * Is c the first character of a one- two- or three-byte utf sequence?
-X */
-X#define	onebyte(c)	((c&0x80)==0x00)
-X#define	twobyte(c)	((c&0xe0)==0xc0)
-X#define	threebyte(c)	((c&0xf0)==0xe0)
-char **argp;
-char **args;
-int nerror;		/* number of errors encountered during compilation */
-int doprompt;		/* is it time for a prompt? */
-X/*
-X * Which fds are the reading/writing end of a pipe?
-X * Unfortunately, this can vary from system to system.
-X * 9th edition Unix doesn't care, the following defines
-X * work on plan 9.
-X */
-X#define	PRD	0
-X#define	PWR	1
-char Rcmain[], Fdprefix[];
-X#define	register
-X/*
-X * How many dot commands have we executed?
-X * Used to ensure that -v flag doesn't print rcmain.
-X */
-int ndot;
-char *getstatus(void);
-int lastc;
-int lastword;
-!
-echo unix.c
-sed 's/^X//' >unix.c <<'!'
-X/*
-X * Unix versions of system-specific functions
-X *	By convention, exported routines herein have names beginning with an
-X *	upper case letter.
-X */
-X#include "rc.h"
-X#include "io.h"
-X#include "exec.h"
-X#include "getflags.h"
-X#include <errno.h>
-
-char Rcmain[]="/usr/lib/rcmain";
-char Fdprefix[]="/dev/fd/";
-
-void execfinit(void);
-
-struct builtin Builtin[] = {
-X	"cd",		execcd,
-X	"whatis",	execwhatis,
-X	"eval",		execeval,
-X	"exec",		execexec,	/* but with popword first */
-X	"exit",		execexit,
-X	"shift",	execshift,
-X	"wait",		execwait,
-X	"umask",	execumask,
-X	".",		execdot,
-X	"finit",	execfinit,
-X	"flag",		execflag,
-X	0
-X};
-X#define	SEP	'\1'
-char **environp;
-
-struct word*
-enval(s)
-register char *s;
-X{
-X	char *t, c;
-X	struct word *v;
-X	for(t = s;*t && *t!=SEP;t++);
-X	c=*t;
-X	*t='\0';
-X	v = newword(s, c=='\0'?(struct word *)0:enval(t+1));
-X	*t = c;
-X	return v;
-X}
-
-void
-Vinit(void)
-X{
-X	extern char **environ;
-X	char *s;
-X	char **env = environ;
-X	environp = env;
-X	for(;*env;env++){
-X		for(s=*env;*s && *s!='(' && *s!='=';s++);
-X		switch(*s){
-X		case '\0':
-X			pfmt(err, "environment %q?\n", *env);
-X			break;
-X		case '=':
-X			*s='\0';
-X			setvar(*env, enval(s+1));
-X			*s='=';
-X			break;
-X		case '(':	/* ignore functions for now */
-X			break;
-X		}
-X	}
-X}
-
-char **envp;
-
-void
-XXrdfn(void)
-X{
-X	char *s;
-X	int len;
-X	for(;*envp;envp++){
-X		for(s=*envp;*s && *s!='(' && *s!='=';s++);
-X		switch(*s){
-X		case '\0':
-X			pfmt(err, "environment %q?\n", *envp);
-X			break;
-X		case '=':	/* ignore variables */
-X			break;
-X		case '(':		/* Bourne again */
-X			s=*envp+3;
-X			envp++;
-X			len = strlen(s);
-X			s[len]='\n';
-X			execcmds(opencore(s, len+1));
-X			s[len]='\0';
-X			return;
-X		}
-X	}
-X	Xreturn();
-X}
-
-union code rdfns[4];
-
-void
-execfinit(void)
-X{
-X	static int first = 1;
-X	if(first){
-X		rdfns[0].i = 1;
-X		rdfns[1].f = Xrdfn;
-X		rdfns[2].f = Xjump;
-X		rdfns[3].i = 1;
-X		first = 0;
-X	}
-X	Xpopm();
-X	envp = environp;
-X	start(rdfns, 1, runq->local);
-X}
-
-int
-cmpenv(const void *aa, const void *ab)
-X{
-X	char **a = aa, **b = ab;
-
-X	return strcmp(*a, *b);
-X}
-
-char **
-mkenv(void)
-X{
-X	char **env, **ep, *p, *q;
-X	struct var **h, *v;
-X	struct word *a;
-X	int nvar = 0, nchr = 0, sep;
-
-X	/*
-X	 * Slightly kludgy loops look at locals then globals.
-X	 * locals no longer exist - geoff
-X	 */
-X	for(h = gvar-1; h != &gvar[NVAR]; h++)
-X	for(v = h >= gvar? *h: runq->local; v ;v = v->next){
-X		if((v==vlook(v->name)) && v->val){
-X			nvar++;
-X			nchr+=strlen(v->name)+1;
-X			for(a = v->val;a;a = a->next)
-X				nchr+=strlen(a->word)+1;
-X		}
-X		if(v->fn){
-X			nvar++;
-X			nchr+=strlen(v->name)+strlen(v->fn[v->pc-1].s)+8;
-X		}
-X	}
-X	env = (char **)emalloc((nvar+1)*sizeof(char *)+nchr);
-X	ep = env;
-X	p = (char *)&env[nvar+1];
-X	for(h = gvar-1; h != &gvar[NVAR]; h++)
-X	for(v = h >= gvar? *h: runq->local;v;v = v->next){
-X		if((v==vlook(v->name)) && v->val){
-X			*ep++=p;
-X			q = v->name;
-X			while(*q) *p++=*q++;
-X			sep='=';
-X			for(a = v->val;a;a = a->next){
-X				*p++=sep;
-X				sep = SEP;
-X				q = a->word;
-X				while(*q) *p++=*q++;
-X			}
-X			*p++='\0';
-X		}
-X		if(v->fn){
-X			*ep++=p;
-X			*p++='#'; *p++='('; *p++=')';	/* to fool Bourne */
-X			*p++='f'; *p++='n'; *p++=' ';
-X			q = v->name;
-X			while(*q) *p++=*q++;
-X			*p++=' ';
-X			q = v->fn[v->pc-1].s;
-X			while(*q) *p++=*q++;
-X			*p++='\0';
-X		}
-X	}
-X	*ep = 0;
-X	qsort((void *)env, nvar, sizeof ep[0], cmpenv);
-X	return env;	
-X}
-char *sigmsg[] = {
-X/*  0 normal  */ 0,
-X/*  1 SIGHUP  */ "Hangup",
-X/*  2 SIGINT  */ 0,
-X/*  3 SIGQUIT */ "Quit",
-X/*  4 SIGILL  */ "Illegal instruction",
-X/*  5 SIGTRAP */ "Trace/BPT trap",
-X/*  6 SIGIOT  */ "abort",
-X/*  7 SIGEMT  */ "EMT trap",
-X/*  8 SIGFPE  */ "Floating exception",
-X/*  9 SIGKILL */ "Killed",
-X/* 10 SIGBUS  */ "Bus error",
-X/* 11 SIGSEGV */ "Memory fault",
-X/* 12 SIGSYS  */ "Bad system call",
-X/* 13 SIGPIPE */ 0,
-X/* 14 SIGALRM */ "Alarm call",
-X/* 15 SIGTERM */ "Terminated",
-X/* 16 unused  */ "signal 16",
-X/* 17 SIGSTOP */ "Process stopped",
-X/* 18 unused  */ "signal 18",
-X/* 19 SIGCONT */ "Process continued",
-X/* 20 SIGCHLD */ "Child death",
-X};
-
-void
-Waitfor(int pid, int persist)
-X{
-X	int wpid, sig;
-X	struct thread *p;
-X	int wstat;
-X	char wstatstr[12];
-
-X	for(;;){
-X		errno = 0;
-X		wpid = wait(&wstat);
-X		if(errno==EINTR && persist)
-X			continue;
-X		if(wpid==-1)
-X			break;
-X		sig = wstat&0177;
-X		if(sig==0177){
-X			pfmt(err, "trace: ");
-X			sig = (wstat>>8)&0177;
-X		}
-X		if(sig>(sizeof sigmsg/sizeof sigmsg[0]) || sigmsg[sig]){
-X			if(pid!=wpid)
-X				pfmt(err, "%d: ", wpid);
-X			if(sig<=(sizeof sigmsg/sizeof sigmsg[0]))
-X				pfmt(err, "%s", sigmsg[sig]);
-X			else if(sig==0177) pfmt(err, "stopped by ptrace");
-X			else pfmt(err, "signal %d", sig);
-X			if(wstat&0200)pfmt(err, " -- core dumped");
-X			pfmt(err, "\n");
-X		}
-X		wstat = sig?sig+1000:(wstat>>8)&0xFF;
-X		if(wpid==pid){
-X			inttoascii(wstatstr, wstat);
-X			setstatus(wstatstr);
-X			break;
-X		}
-X		else{
-X			for(p = runq->ret;p;p = p->ret)
-X				if(p->pid==wpid){
-X					p->pid=-1;
-X					inttoascii(p->status, wstat);
-X					break;
-X				}
-X		}
-X	}
-X}
-
-char **
-mkargv(a)
-register struct word *a;
-X{
-X	char **argv = (char **)emalloc((count(a)+2)*sizeof(char *));
-X	char **argp = argv+1;	/* leave one at front for runcoms */
-
-X	for(;a;a = a->next)
-X		*argp++=a->word;
-X	*argp = 0;
-X	return argv;
-X}
-
-void
-Updenv(void)
-X{
-X}
-
-void
-Execute(struct word *args, struct word *path)
-X{
-X	char *msg="not found";
-X#ifdef ETXTBSY
-X	int txtbusy = 0;
-X#endif
-X	char **env = mkenv();
-X	char **argv = mkargv(args);
-X	char file[512];
-
-X	for(;path;path = path->next){
-X		strcpy(file, path->word);
-X		if(file[0])
-X			strcat(file, "/");
-X		strcat(file, argv[1]);
-X#ifdef ETXTBSY
-ReExec:
-X#endif
-X		execve(file, argv+1, env);
-X		switch(errno){
-X		case ENOEXEC:
-X			pfmt(err, "%s: Bourne again\n", argv[1]);
-X			argv[0]="sh";
-X			argv[1] = strdup(file);
-X			execve("/bin/sh", argv, env);
-X			goto Bad;
-X#ifdef ETXTBSY
-X		case ETXTBSY:
-X			if(++txtbusy!=5){
-X				sleep(txtbusy);
-X				goto ReExec;
-X			}
-X			msg="text busy"; goto Bad;
-X#endif
-X		case EACCES:
-X			msg="no access";
-X			break;
-X		case ENOMEM:
-X			msg="not enough memory"; goto Bad;
-X		case E2BIG:
-X			msg="too big"; goto Bad;
-X		}
-X	}
-Bad:
-X	pfmt(err, "%s: %s\n", argv[1], msg);
-X	efree((char *)env);
-X	efree((char *)argv);
-X}
-
-X#define	NDIR	14		/* should get this from param.h */
-
-Globsize(p)
-register char *p;
-X{
-X	int isglob = 0, globlen = NDIR+1;
-X	for(;*p;p++){
-X		if(*p==GLOB){
-X			p++;
-X			if(*p!=GLOB)
-X				isglob++;
-X			globlen+=*p=='*'?NDIR:1;
-X		}
-X		else
-X			globlen++;
-X	}
-X	return isglob?globlen:0;
-X}
-
-X#include <sys/types.h>
-X#include <dirent.h>
-
-X#define	NDIRLIST	50
-
-DIR *dirlist[NDIRLIST];
-
-Opendir(name)
-char *name;
-X{
-X	DIR **dp;
-X	for(dp = dirlist;dp!=&dirlist[NDIRLIST];dp++)
-X		if(*dp==0){
-X			*dp = opendir(name);
-X			return *dp?dp-dirlist:-1;
-X		}
-X	return -1;
-X}
-
-int
-Readdir(int f, char *p, int /* onlydirs */ )
-X{
-X	struct dirent *dp = readdir(dirlist[f]);
-
-X	if(dp==0)
-X		return 0;
-X	strcpy(p, dp->d_name);
-X	return 1;
-X}
-
-void
-Closedir(int f)
-X{
-X	closedir(dirlist[f]);
-X	dirlist[f] = 0;
-X}
-
-char *Signame[] = {
-X	"sigexit",	"sighup",	"sigint",	"sigquit",
-X	"sigill",	"sigtrap",	"sigiot",	"sigemt",
-X	"sigfpe",	"sigkill",	"sigbus",	"sigsegv",
-X	"sigsys",	"sigpipe",	"sigalrm",	"sigterm",
-X	"sig16",	"sigstop",	"sigtstp",	"sigcont",
-X	"sigchld",	"sigttin",	"sigttou",	"sigtint",
-X	"sigxcpu",	"sigxfsz",	"sig26",	"sig27",
-X	"sig28",	"sig29",	"sig30",	"sig31",
-X	0,
-X};
-
-void
-gettrap(int sig)
-X{
-X	signal(sig, gettrap);
-X	trap[sig]++;
-X	ntrap++;
-X	if(ntrap>=NSIG){
-X		pfmt(err, "rc: Too many traps (trap %d), dumping core\n", sig);
-X		signal(SIGABRT, (void (*)())0);
-X		kill(getpid(), SIGABRT);
-X	}
-X}
-
-void
-Trapinit(void)
-X{
-X	int i;
-X	void (*sig)();
-
-X	if(1 || flag['d']){	/* wrong!!! */
-X		sig = signal(SIGINT, gettrap);
-X		if(sig==SIG_IGN)
-X			signal(SIGINT, SIG_IGN);
-X	}
-X	else{
-X		for(i = 1;i<=NSIG;i++) if(i!=SIGCHLD){
-X			sig = signal(i, gettrap);
-X			if(sig==SIG_IGN)
-X				signal(i, SIG_IGN);
-X		}
-X	}
-X}
-
-Unlink(name)
-char *name;
-X{
-X	return unlink(name);
-X}
-Write(fd, buf, cnt)
-char *buf;
-X{
-X	return write(fd, buf, cnt);
-X}
-Read(fd, buf, cnt)
-char *buf;
-X{
-X	return read(fd, buf, cnt);
-X}
-Seek(fd, cnt, whence)
-long cnt;
-X{
-X	return lseek(fd, cnt, whence);
-X}
-Executable(file)
-char *file;
-X{
-X	return(access(file, 01)==0);
-X}
-Creat(file)
-char *file;
-X{
-X	return creat(file, 0666);
-X}
-Dup(a, b){
-X	return dup2(a, b);
-X}
-Dup1(a){
-X	return dup(a);
-X}
-X/*
-X * Wrong:  should go through components of a|b|c and return the maximum.
-X */
-void
-Exit(char *stat)
-X{
-X	int n = 0;
-
-X	while(*stat){
-X		if(*stat!='|'){
-X			if(*stat<'0' || '9'<*stat)
-X				exit(1);
-X			else n = n*10+*stat-'0';
-X		}
-X		stat++;
-X	}
-X	exit(n);
-X}
-Eintr(){
-X	return errno==EINTR;
-X}
-
-void
-Noerror()
-X{
-X	errno = 0;
-X}
-Isatty(fd){
-X	return isatty(fd);
-X}
-
-void
-Abort()
-X{
-X	abort();
-X}
-
-void
-execumask(void)		/* wrong -- should fork before writing */
-X{
-X	int m;
-X	struct io out[1];
-X	switch(count(runq->argv->words)){
-X	default:
-X		pfmt(err, "Usage: umask [umask]\n");
-X		setstatus("umask usage");
-X		poplist();
-X		return;
-X	case 2:
-X		umask(octal(runq->argv->words->next->word));
-X		break;
-X	case 1: 
-X		umask(m = umask(0));
-X		out->fd = mapfd(1);
-X		out->bufp = out->buf;
-X		out->ebuf=&out->buf[NBUF];
-X		out->strp = 0;
-X		pfmt(out, "%o\n", m);
-X		break;
-X	}
-X	setstatus("");
-X	poplist();
-X}
-
-void
-Memcpy(a, b, n)
-char *a, *b;
-X{
-X	memmove(a, b, n);
-X}
-
-void*
-Malloc(unsigned long n)
-X{
-X	return (void *)malloc(n);
-X}
-
-void
-errstr(char *buf, int len)
-X{
-X	strncpy(buf, strerror(errno), len);
-X}
-!
-
-From geoff@collyer.net Fri Dec 19 01:23:26 EST 2003
-Received: from plan9.cs.bell-labs.com ([135.104.9.2]) by plan9; Fri Dec 19 01:23:25 EST 2003
-Received: from collyer.net ([63.192.14.226]) by plan9; Fri Dec 19 01:23:22 EST 2003
-Message-ID: <0b5ea130198a21a49139759d00d69939@collyer.net>
-subject: rc on unix, part 2
-From: Geoff Collyer <geoff@collyer.net>
-Date: Thu, 18 Dec 2003 22:23:21 -0800
-To: presotto@plan9.bell-labs.com, rsc@plan9.bell-labs.com, geoff@collyer.net
-MIME-Version: 1.0
-Content-Type: text/plain; charset="US-ASCII"
-Content-Transfer-Encoding: 7bit
-
-These are the include files I used to emulate plan 9's include
-files on Unix (APE).
-
-
-# To unbundle, run this file
-mkdir include
-echo include/bio.h
-sed 's/^X//' >include/bio.h <<'!'
-X#ifndef _BIOH_
-X#define _BIOH_ 1
-
-X#include <sys/types.h>	/* for off_t */
-X#include <fcntl.h>	/* for O_RDONLY, O_WRONLY */
-
-typedef	struct	Biobuf	Biobuf;
-
-enum
-X{
-X	Bsize		= 8*1024,
-X	Bungetsize	= 4,		/* space for ungetc */
-X	Bmagic		= 0x314159,
-X	Beof		= -1,
-X	Bbad		= -2,
-
-X	Binactive	= 0,		/* states */
-X	Bractive,
-X	Bwactive,
-X	Bracteof,
-
-X	Bend
-X};
-
-struct	Biobuf
-X{
-X	int	icount;		/* neg num of bytes at eob */
-X	int	ocount;		/* num of bytes at bob */
-X	int	rdline;		/* num of bytes after rdline */
-X	int	runesize;		/* num of bytes of last getrune */
-X	int	state;		/* r/w/inactive */
-X	int	fid;		/* open file */
-X	int	flag;		/* magic if malloc'ed */
-X	off_t	offset;		/* offset of buffer in file */
-X	int	bsize;		/* size of buffer */
-X	unsigned char*	bbuf;		/* pointer to beginning of buffer */
-X	unsigned char*	ebuf;		/* pointer to end of buffer */
-X	unsigned char*	gbuf;		/* pointer to good data in buf */
-X	unsigned char	b[Bungetsize+Bsize];
-X};
-
-X#define	BGETC(bp)\
-X	((bp)->icount?(bp)->bbuf[(bp)->bsize+(bp)->icount++]:Bgetc((bp)))
-X#define	BPUTC(bp,c)\
-X	((bp)->ocount?(bp)->bbuf[(bp)->bsize+(bp)->ocount++]=(c),0:Bputc((bp),(c)))
-X#define	BOFFSET(bp)\
-X	(((bp)->state==Bractive)?\
-X		(bp)->offset + (bp)->icount:\
-X	(((bp)->state==Bwactive)?\
-X		(bp)->offset + ((bp)->bsize + (bp)->ocount):\
-X		-1))
-X#define	BLINELEN(bp)\
-X	(bp)->rdline
-X#define	BFILDES(bp)\
-X	(bp)->fid
-
-int	Bbuffered(Biobuf*);
-int	Bfildes(Biobuf*);
-int	Bflush(Biobuf*);
-int	Bgetc(Biobuf*);
-int	Bgetd(Biobuf*, double*);
-int	Binit(Biobuf*, int, int);
-int	Binits(Biobuf*, int, int, unsigned char*, int);
-int	Blinelen(Biobuf*);
-off_t	Boffset(Biobuf*);
-Biobuf*	Bopen(char*, int);
-int	Bprint(Biobuf*, char*, ...);
-int	Bputc(Biobuf*, int);
-void*	Brdline(Biobuf*, int);
-long	Bread(Biobuf*, void*, long);
-off_t	Bseek(Biobuf*, off_t, int);
-int	Bterm(Biobuf*);
-int	Bungetc(Biobuf*);
-long	Bwrite(Biobuf*, void*, long);
-
-long	Bgetrune(Biobuf*);
-int	Bputrune(Biobuf*, long);
-int	Bungetrune(Biobuf*);
-
-X#endif
-!
-echo include/fmt.h
-sed 's/^X//' >include/fmt.h <<'!'
-
-X/*
-X * The authors of this software are Rob Pike and Ken Thompson.
-X *              Copyright (c) 2002 by Lucent Technologies.
-X * Permission to use, copy, modify, and distribute this software for any
-X * purpose without fee is hereby granted, provided that this entire notice
-X * is included in all copies of any software which is or includes a copy
-X * or modification of this software and in all copies of the supporting
-X * documentation for such software.
-X * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-X * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY
-X * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
-X * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-X */
-
-X#ifndef _FMTH_
-X#define _FMTH_ 1
-
-X#include <stdarg.h>
-
-X#ifndef _UTFH_
-X#include <utf.h>
-X#endif
-
-typedef struct Fmt	Fmt;
-struct Fmt{
-X	unsigned char	runes;		/* output buffer is runes or chars? */
-X	void	*start;			/* of buffer */
-X	void	*to;			/* current place in the buffer */
-X	void	*stop;			/* end of the buffer; overwritten if flush fails */
-X	int	(*flush)(Fmt *);	/* called when to == stop */
-X	void	*farg;			/* to make flush a closure */
-X	int	nfmt;			/* num chars formatted so far */
-X	va_list	args;			/* args passed to dofmt */
-X	int	r;			/* % format Rune */
-X	int	width;
-X	int	prec;
-X	unsigned long	flags;
-X};
-
-enum{
-X	FmtWidth	= 1,
-X	FmtLeft		= FmtWidth << 1,
-X	FmtPrec		= FmtLeft << 1,
-X	FmtSharp	= FmtPrec << 1,
-X	FmtSpace	= FmtSharp << 1,
-X	FmtSign		= FmtSpace << 1,
-X	FmtZero		= FmtSign << 1,
-X	FmtUnsigned	= FmtZero << 1,
-X	FmtShort	= FmtUnsigned << 1,
-X	FmtLong		= FmtShort << 1,
-X	FmtVLong	= FmtLong << 1,
-X	FmtComma	= FmtVLong << 1,
-X	FmtByte		= FmtComma << 1,
-X	FmtLDouble	= FmtByte << 1,
-
-X	FmtFlag		= FmtLDouble << 1
-X};
-
-extern	int	print(char*, ...);
-extern	char*	seprint(char*, char*, char*, ...);
-extern	char*	vseprint(char*, char*, char*, va_list);
-extern	int	snprint(char*, int, char*, ...);
-extern	int	vsnprint(char*, int, char*, va_list);
-extern	char*	smprint(char*, ...);
-extern	char*	vsmprint(char*, va_list);
-extern	int	sprint(char*, char*, ...);
-extern	int	fprint(int, char*, ...);
-extern	int	vfprint(int, char*, va_list);
-
-extern	int	runesprint(Rune*, char*, ...);
-extern	int	runesnprint(Rune*, int, char*, ...);
-extern	int	runevsnprint(Rune*, int, char*, va_list);
-extern	Rune*	runeseprint(Rune*, Rune*, char*, ...);
-extern	Rune*	runevseprint(Rune*, Rune*, char*, va_list);
-extern	Rune*	runesmprint(char*, ...);
-extern	Rune*	runevsmprint(char*, va_list);
-
-extern	int	fmtfdinit(Fmt*, int, char*, int);
-extern	int	fmtfdflush(Fmt*);
-extern	int	fmtstrinit(Fmt*);
-extern	char*	fmtstrflush(Fmt*);
-
-extern	int	quotestrfmt(Fmt *f);
-extern	void	quotefmtinstall(void);
-extern	int	(*fmtdoquote)(int);
-
-
-extern	int	fmtinstall(int, int (*)(Fmt*));
-extern	int	dofmt(Fmt*, char*);
-extern	int	fmtprint(Fmt*, char*, ...);
-extern	int	fmtvprint(Fmt*, char*, va_list);
-extern	int	fmtrune(Fmt*, int);
-extern	int	fmtstrcpy(Fmt*, char*);
-
-extern	double	fmtstrtod(const char *, char **);
-extern	double	fmtcharstod(int(*)(void*), void*);
-
-X#endif
-!
-echo include/lib9.h
-sed 's/^X//' >include/lib9.h <<'!'
-X#include <string.h>
-X#include "utf.h"
-
-X#define nil ((void*)0)
-
-X#define uchar _fmtuchar
-X#define ushort _fmtushort
-X#define uint _fmtuint
-X#define ulong _fmtulong
-X#define vlong _fmtvlong
-X#define uvlong _fmtuvlong
-
-typedef unsigned char		uchar;
-typedef unsigned short		ushort;
-typedef unsigned int		uint;
-typedef unsigned long		ulong;
-
-X#define OREAD O_RDONLY
-X#define OWRITE O_WRONLY
-X#define ORDWR O_RDWR
-X#define OCEXEC 0
-!
-echo include/regexp9.h
-sed 's/^X//' >include/regexp9.h <<'!'
-X#ifndef _REGEXP9H_
-
-X#define _REGEXP9H_ 1
-X#include <utf.h>
-
-typedef struct Resub		Resub;
-typedef struct Reclass		Reclass;
-typedef struct Reinst		Reinst;
-typedef struct Reprog		Reprog;
-
-X/*
-X *	Sub expression matches
-X */
-struct Resub{
-X	union
-X	{
-X		char *sp;
-X		Rune *rsp;
-X	}s;
-X	union
-X	{
-X		char *ep;
-X		Rune *rep;
-X	}e;
-X};
-
-X/*
-X *	character class, each pair of rune's defines a range
-X */
-struct Reclass{
-X	Rune	*end;
-X	Rune	spans[64];
-X};
-
-X/*
-X *	Machine instructions
-X */
-struct Reinst{
-X	int	type;
-X	union	{
-X		Reclass	*cp;		/* class pointer */
-X		Rune	r;		/* character */
-X		int	subid;		/* sub-expression id for RBRA and LBRA */
-X		Reinst	*right;		/* right child of OR */
-X	}u1;
-X	union {	/* regexp relies on these two being in the same union */
-X		Reinst *left;		/* left child of OR */
-X		Reinst *next;		/* next instruction for CAT & LBRA */
-X	}u2;
-X};
-
-X/*
-X *	Reprogram definition
-X */
-struct Reprog{
-X	Reinst	*startinst;	/* start pc */
-X	Reclass	class[16];	/* .data */
-X	Reinst	firstinst[5];	/* .text */
-X};
-
-extern Reprog	*regcomp(char*);
-extern Reprog	*regcomplit(char*);
-extern Reprog	*regcompnl(char*);
-extern void	regerror(char*);
-extern int	regexec(Reprog*, char*, Resub*, int);
-extern void	regsub(char*, char*, int, Resub*, int);
-
-extern int	rregexec(Reprog*, Rune*, Resub*, int);
-extern void	rregsub(Rune*, Rune*, Resub*, int);
-
-X#endif
-!
-echo include/utf.h
-sed 's/^X//' >include/utf.h <<'!'
-X#ifndef _UTFH_
-X#define _UTFH_ 1
-
-typedef unsigned short Rune;	/* 16 bits */
-
-enum
-X{
-X	UTFmax		= 3,		/* maximum bytes per rune */
-X	Runesync	= 0x80,		/* cannot represent part of a UTF sequence (<) */
-X	Runeself	= 0x80,		/* rune and UTF sequences are the same (<) */
-X	Runeerror	= 0x80,		/* decoding error in UTF */
-X};
-
-X/*
-X * rune routines
-X */
-extern	int	runetochar(char*, Rune*);
-extern	int	chartorune(Rune*, char*);
-extern	int	runelen(long);
-extern	int	runenlen(Rune*, int);
-extern	int	fullrune(char*, int);
-extern	int	utflen(char*);
-extern	int	utfnlen(char*, long);
-extern	char*	utfrune(char*, long);
-extern	char*	utfrrune(char*, long);
-extern	char*	utfutf(char*, char*);
-extern	char*	utfecpy(char*, char*, char*);
-
-extern	Rune*	runestrcat(Rune*, Rune*);
-extern	Rune*	runestrchr(Rune*, Rune);
-extern	int	runestrcmp(Rune*, Rune*);
-extern	Rune*	runestrcpy(Rune*, Rune*);
-extern	Rune*	runestrncpy(Rune*, Rune*, long);
-extern	Rune*	runestrecpy(Rune*, Rune*, Rune*);
-extern	Rune*	runestrdup(Rune*);
-extern	Rune*	runestrncat(Rune*, Rune*, long);
-extern	int	runestrncmp(Rune*, Rune*, long);
-extern	Rune*	runestrrchr(Rune*, Rune);
-extern	long	runestrlen(Rune*);
-extern	Rune*	runestrstr(Rune*, Rune*);
-
-extern	Rune	tolowerrune(Rune);
-extern	Rune	totitlerune(Rune);
-extern	Rune	toupperrune(Rune);
-extern	int	isalpharune(Rune);
-extern	int	islowerrune(Rune);
-extern	int	isspacerune(Rune);
-extern	int	istitlerune(Rune);
-extern	int	isupperrune(Rune);
-
-X#endif
-!
-
--- /sys/src/cmd/rc/rc.h	Wed Jun 27 00:57:24 2007
+++ /sys/src/cmd/rc/rc.h	Fri Mar  1 00:35:01 2013
@@ -1,9 +1,7 @@
 /*
  * Plan9 is defined for plan 9
- * V9 is defined for 9th edition
- * Sun is defined for sun-os
- * Please don't litter the code with ifdefs.  The three below (and one in
- * getflags) should be enough.
+ * Unix is defined for Unix
+ * Please don't litter the code with ifdefs.  The six below should be enough.
  */
 #define	Plan9
 #ifdef	Plan9
@@ -13,13 +11,34 @@
 #define	SIGINT	2
 #define	SIGQUIT	3
 #endif
-#ifdef	V9
+
+#ifdef Unix
+#define _BSD_EXTENSION
+#define _PLAN9_SOURCE
+#define _POSIX_SOURCE
+#define _RESEARCH_SOURCE
+#define _SUSV2_SOURCE
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <lib9.h>
 #include <signal.h>
-#include <libc.h>
+#include <inttypes.h>
+
+#ifndef NSIG
+#define NSIG 32
 #endif
-#ifdef Sun
-#include <signal.h>
+
+#define uintptr uintptr_t
 #endif
+
+#ifndef ERRMAX
+#define ERRMAX 128
+#endif
+
 #define	YYMAXDEPTH	500
 #ifndef PAREN
 #include "x.tab.h"
@@ -34,12 +53,14 @@
 typedef struct thread thread;
 typedef struct builtin builtin;
 
+#ifdef Plan9
 #pragma incomplete word
 #pragma incomplete io
+#endif
 
 struct tree{
 	int	type;
-	int	rtype, fd0, fd1;	/* details of REDIR PIPE DUP tokens */
+	int	rtype, fd0, fd1;		/* details of REDIR PIPE DUP tokens */
 	char	*str;
 	int	quoted;
 	int	iskw;
@@ -54,6 +75,7 @@
 tree *simplemung(tree*), *heredoc(tree*);
 void freetree(tree*);
 tree *cmdtree;
+
 /*
  * The first word of any code vector is a reference count.
  * Always create a new reference to a code vector by calling codecopy(.).
@@ -93,7 +115,7 @@
 
 #define	NVAR	521
 
-var *gvar[NVAR];				/* hash for globals */
+var *gvar[NVAR];		/* hash for globals */
 
 #define	new(type)	((type *)emalloc(sizeof(type)))
 
--- /sys/src/cmd/rc/unix/havefork.c	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/havefork.c	Thu Feb 28 21:33:17 2013
@@ -0,0 +1,217 @@
+#include "rc.h"
+#include "getflags.h"
+#include "exec.h"
+#include "io.h"
+#include "fns.h"
+
+int havefork = 1;
+
+void
+Xasync(void)
+{
+	int null = open("/dev/null", 0);
+	int pid;
+	char npid[10];
+	if(null<0){
+		Xerror("Can't open /dev/null\n");
+		return;
+	}
+#ifdef Unix
+	pid = fork();
+#else
+	pid = rfork(RFFDG|RFPROC|RFNOTEG);
+#endif
+	switch(pid){
+	case -1:
+		close(null);
+		Xerror("try again");
+		break;
+	case 0:
+		pushredir(ROPEN, null, 0);
+		start(runq->code, runq->pc+1, runq->local);
+		runq->ret = 0;
+		break;
+	default:
+		close(null);
+		runq->pc = runq->code[runq->pc].i;
+		inttoascii(npid, pid);
+		setvar("apid", newword(npid, (word *)0));
+		break;
+	}
+}
+
+void
+Xpipe(void)
+{
+	struct thread *p = runq;
+	int pc = p->pc, forkid;
+	int lfd = p->code[pc++].i;
+	int rfd = p->code[pc++].i;
+	int pfd[2];
+	if(pipe(pfd)<0){
+		Xerror("can't get pipe");
+		return;
+	}
+	switch(forkid = fork()){
+	case -1:
+		Xerror("try again");
+		break;
+	case 0:
+		start(p->code, pc+2, runq->local);
+		runq->ret = 0;
+		close(pfd[PRD]);
+		pushredir(ROPEN, pfd[PWR], lfd);
+		break;
+	default:
+		start(p->code, p->code[pc].i, runq->local);
+		close(pfd[PWR]);
+		pushredir(ROPEN, pfd[PRD], rfd);
+		p->pc = p->code[pc+1].i;
+		p->pid = forkid;
+		break;
+	}
+}
+
+/*
+ * Who should wait for the exit from the fork?
+ */
+void
+Xbackq(void)
+{
+	char wd[8193];
+	int c;
+	char *s, *ewd=&wd[8192], *stop;
+	struct io *f;
+	var *ifs = vlook("ifs");
+	word *v, *nextv;
+	int pfd[2];
+	int pid;
+	stop = ifs->val?ifs->val->word:"";
+	if(pipe(pfd)<0){
+		Xerror("can't make pipe");
+		return;
+	}
+	switch(pid = fork()){
+	case -1:
+		Xerror("try again");
+		close(pfd[PRD]);
+		close(pfd[PWR]);
+		return;
+	case 0:
+		close(pfd[PRD]);
+		start(runq->code, runq->pc+1, runq->local);
+		pushredir(ROPEN, pfd[PWR], 1);
+		return;
+	default:
+		close(pfd[PWR]);
+		f = openfd(pfd[PRD]);
+		s = wd;
+		v = 0;
+		while((c = rchr(f))!=EOF){
+			if(strchr(stop, c) || s==ewd){
+				if(s!=wd){
+					*s='\0';
+					v = newword(wd, v);
+					s = wd;
+				}
+			}
+			else *s++=c;
+		}
+		if(s!=wd){
+			*s='\0';
+			v = newword(wd, v);
+		}
+		closeio(f);
+		Waitfor(pid, 0);
+		/* v points to reversed arglist -- reverse it onto argv */
+		while(v){
+			nextv = v->next;
+			v->next = runq->argv->words;
+			runq->argv->words = v;
+			v = nextv;
+		}
+		runq->pc = runq->code[runq->pc].i;
+		return;
+	}
+}
+
+void
+Xpipefd(void)
+{
+	struct thread *p = runq;
+	int pc = p->pc;
+	char name[40];
+	int pfd[2];
+	int sidefd, mainfd;
+	if(pipe(pfd)<0){
+		Xerror("can't get pipe");
+		return;
+	}
+	if(p->code[pc].i==READ){
+		sidefd = pfd[PWR];
+		mainfd = pfd[PRD];
+	}
+	else{
+		sidefd = pfd[PRD];
+		mainfd = pfd[PWR];
+	}
+	switch(fork()){
+	case -1:
+		Xerror("try again");
+		break;
+	case 0:
+		start(p->code, pc+2, runq->local);
+		close(mainfd);
+		pushredir(ROPEN, sidefd, p->code[pc].i==READ?1:0);
+		runq->ret = 0;
+		break;
+	default:
+		close(sidefd);
+		pushredir(ROPEN, mainfd, mainfd);	/* isn't this a noop? */
+		strcpy(name, Fdprefix);
+		inttoascii(name+strlen(name), mainfd);
+		pushword(name);
+		p->pc = p->code[pc+1].i;
+		break;
+	}
+}
+
+void
+Xsubshell(void)
+{
+	int pid;
+	switch(pid = fork()){
+	case -1:
+		Xerror("try again");
+		break;
+	case 0:
+		start(runq->code, runq->pc+1, runq->local);
+		runq->ret = 0;
+		break;
+	default:
+		Waitfor(pid, 1);
+		runq->pc = runq->code[runq->pc].i;
+		break;
+	}
+}
+
+int
+execforkexec(void)
+{
+	int pid;
+	int n;
+	char buf[ERRMAX];
+
+	switch(pid = fork()){
+	case -1:
+		return -1;
+	case 0:
+		pushword("exec");
+		execexec();
+		strcpy(buf, "can't exec: ");
+		n = strlen(buf);
+		errstr(buf+n, ERRMAX-n);
+		Exit(buf);
+	}
+	return pid;
+}
--- /sys/src/cmd/rc/unix/include/bio.h	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/include/bio.h	Thu Feb 28 21:06:37 2013
@@ -0,0 +1,80 @@
+#ifndef _BIOH_
+#define _BIOH_ 1
+
+#include <sys/types.h>	/* for off_t */
+#include <fcntl.h>	/* for O_RDONLY, O_WRONLY */
+
+typedef	struct	Biobuf	Biobuf;
+
+enum
+{
+	Bsize		= 8*1024,
+	Bungetsize	= 4,		/* space for ungetc */
+	Bmagic		= 0x314159,
+	Beof		= -1,
+	Bbad		= -2,
+
+	Binactive	= 0,		/* states */
+	Bractive,
+	Bwactive,
+	Bracteof,
+
+	Bend
+};
+
+struct	Biobuf
+{
+	int	icount;		/* neg num of bytes at eob */
+	int	ocount;		/* num of bytes at bob */
+	int	rdline;		/* num of bytes after rdline */
+	int	runesize;		/* num of bytes of last getrune */
+	int	state;		/* r/w/inactive */
+	int	fid;		/* open file */
+	int	flag;		/* magic if malloc'ed */
+	off_t	offset;		/* offset of buffer in file */
+	int	bsize;		/* size of buffer */
+	unsigned char*	bbuf;		/* pointer to beginning of buffer */
+	unsigned char*	ebuf;		/* pointer to end of buffer */
+	unsigned char*	gbuf;		/* pointer to good data in buf */
+	unsigned char	b[Bungetsize+Bsize];
+};
+
+#define	BGETC(bp)\
+	((bp)->icount?(bp)->bbuf[(bp)->bsize+(bp)->icount++]:Bgetc((bp)))
+#define	BPUTC(bp,c)\
+	((bp)->ocount?(bp)->bbuf[(bp)->bsize+(bp)->ocount++]=(c),0:Bputc((bp),(c)))
+#define	BOFFSET(bp)\
+	(((bp)->state==Bractive)?\
+		(bp)->offset + (bp)->icount:\
+	(((bp)->state==Bwactive)?\
+		(bp)->offset + ((bp)->bsize + (bp)->ocount):\
+		-1))
+#define	BLINELEN(bp)\
+	(bp)->rdline
+#define	BFILDES(bp)\
+	(bp)->fid
+
+int	Bbuffered(Biobuf*);
+int	Bfildes(Biobuf*);
+int	Bflush(Biobuf*);
+int	Bgetc(Biobuf*);
+int	Bgetd(Biobuf*, double*);
+int	Binit(Biobuf*, int, int);
+int	Binits(Biobuf*, int, int, unsigned char*, int);
+int	Blinelen(Biobuf*);
+off_t	Boffset(Biobuf*);
+Biobuf*	Bopen(char*, int);
+int	Bprint(Biobuf*, char*, ...);
+int	Bputc(Biobuf*, int);
+void*	Brdline(Biobuf*, int);
+long	Bread(Biobuf*, void*, long);
+off_t	Bseek(Biobuf*, off_t, int);
+int	Bterm(Biobuf*);
+int	Bungetc(Biobuf*);
+long	Bwrite(Biobuf*, void*, long);
+
+long	Bgetrune(Biobuf*);
+int	Bputrune(Biobuf*, long);
+int	Bungetrune(Biobuf*);
+
+#endif
--- /sys/src/cmd/rc/unix/include/fmt.h	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/include/fmt.h	Thu Feb 28 21:06:37 2013
@@ -0,0 +1,99 @@
+
+/*
+ * The authors of this software are Rob Pike and Ken Thompson.
+ *              Copyright (c) 2002 by Lucent Technologies.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ */
+
+#ifndef _FMTH_
+#define _FMTH_ 1
+
+#include <stdarg.h>
+
+#ifndef _UTFH_
+#include <utf.h>
+#endif
+
+typedef struct Fmt	Fmt;
+struct Fmt{
+	unsigned char	runes;		/* output buffer is runes or chars? */
+	void	*start;			/* of buffer */
+	void	*to;			/* current place in the buffer */
+	void	*stop;			/* end of the buffer; overwritten if flush fails */
+	int	(*flush)(Fmt *);	/* called when to == stop */
+	void	*farg;			/* to make flush a closure */
+	int	nfmt;			/* num chars formatted so far */
+	va_list	args;			/* args passed to dofmt */
+	int	r;			/* % format Rune */
+	int	width;
+	int	prec;
+	unsigned long	flags;
+};
+
+enum{
+	FmtWidth	= 1,
+	FmtLeft		= FmtWidth << 1,
+	FmtPrec		= FmtLeft << 1,
+	FmtSharp	= FmtPrec << 1,
+	FmtSpace	= FmtSharp << 1,
+	FmtSign		= FmtSpace << 1,
+	FmtZero		= FmtSign << 1,
+	FmtUnsigned	= FmtZero << 1,
+	FmtShort	= FmtUnsigned << 1,
+	FmtLong		= FmtShort << 1,
+	FmtVLong	= FmtLong << 1,
+	FmtComma	= FmtVLong << 1,
+	FmtByte		= FmtComma << 1,
+	FmtLDouble	= FmtByte << 1,
+
+	FmtFlag		= FmtLDouble << 1
+};
+
+extern	int	print(char*, ...);
+extern	char*	seprint(char*, char*, char*, ...);
+extern	char*	vseprint(char*, char*, char*, va_list);
+extern	int	snprint(char*, int, char*, ...);
+extern	int	vsnprint(char*, int, char*, va_list);
+extern	char*	smprint(char*, ...);
+extern	char*	vsmprint(char*, va_list);
+extern	int	sprint(char*, char*, ...);
+extern	int	fprint(int, char*, ...);
+extern	int	vfprint(int, char*, va_list);
+
+extern	int	runesprint(Rune*, char*, ...);
+extern	int	runesnprint(Rune*, int, char*, ...);
+extern	int	runevsnprint(Rune*, int, char*, va_list);
+extern	Rune*	runeseprint(Rune*, Rune*, char*, ...);
+extern	Rune*	runevseprint(Rune*, Rune*, char*, va_list);
+extern	Rune*	runesmprint(char*, ...);
+extern	Rune*	runevsmprint(char*, va_list);
+
+extern	int	fmtfdinit(Fmt*, int, char*, int);
+extern	int	fmtfdflush(Fmt*);
+extern	int	fmtstrinit(Fmt*);
+extern	char*	fmtstrflush(Fmt*);
+
+extern	int	quotestrfmt(Fmt *f);
+extern	void	quotefmtinstall(void);
+extern	int	(*fmtdoquote)(int);
+
+
+extern	int	fmtinstall(int, int (*)(Fmt*));
+extern	int	dofmt(Fmt*, char*);
+extern	int	fmtprint(Fmt*, char*, ...);
+extern	int	fmtvprint(Fmt*, char*, va_list);
+extern	int	fmtrune(Fmt*, int);
+extern	int	fmtstrcpy(Fmt*, char*);
+
+extern	double	fmtstrtod(const char *, char **);
+extern	double	fmtcharstod(int(*)(void*), void*);
+
+#endif
--- /sys/src/cmd/rc/unix/include/lib9.h	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/include/lib9.h	Thu Feb 28 21:28:44 2013
@@ -0,0 +1,23 @@
+#include <string.h>
+#include "utf.h"
+
+#define nil ((void*)0)
+
+#define uchar _fmtuchar
+#define ushort _fmtushort
+#define uint _fmtuint
+#define ulong _fmtulong
+#define vlong _fmtvlong
+// #define uvlong _fmtuvlong
+
+typedef unsigned char		uchar;
+typedef unsigned short		ushort;
+typedef unsigned int		uint;
+typedef unsigned long		ulong;
+
+typedef unsigned long long uvlong;
+
+#define OREAD O_RDONLY
+#define OWRITE O_WRONLY
+#define ORDWR O_RDWR
+#define OCEXEC 0
--- /sys/src/cmd/rc/unix/include/regexp9.h	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/include/regexp9.h	Thu Feb 28 21:06:37 2013
@@ -0,0 +1,71 @@
+#ifndef _REGEXP9H_
+
+#define _REGEXP9H_ 1
+#include <utf.h>
+
+typedef struct Resub		Resub;
+typedef struct Reclass		Reclass;
+typedef struct Reinst		Reinst;
+typedef struct Reprog		Reprog;
+
+/*
+ *	Sub expression matches
+ */
+struct Resub{
+	union
+	{
+		char *sp;
+		Rune *rsp;
+	}s;
+	union
+	{
+		char *ep;
+		Rune *rep;
+	}e;
+};
+
+/*
+ *	character class, each pair of rune's defines a range
+ */
+struct Reclass{
+	Rune	*end;
+	Rune	spans[64];
+};
+
+/*
+ *	Machine instructions
+ */
+struct Reinst{
+	int	type;
+	union	{
+		Reclass	*cp;		/* class pointer */
+		Rune	r;		/* character */
+		int	subid;		/* sub-expression id for RBRA and LBRA */
+		Reinst	*right;		/* right child of OR */
+	}u1;
+	union {	/* regexp relies on these two being in the same union */
+		Reinst *left;		/* left child of OR */
+		Reinst *next;		/* next instruction for CAT & LBRA */
+	}u2;
+};
+
+/*
+ *	Reprogram definition
+ */
+struct Reprog{
+	Reinst	*startinst;	/* start pc */
+	Reclass	class[16];	/* .data */
+	Reinst	firstinst[5];	/* .text */
+};
+
+extern Reprog	*regcomp(char*);
+extern Reprog	*regcomplit(char*);
+extern Reprog	*regcompnl(char*);
+extern void	regerror(char*);
+extern int	regexec(Reprog*, char*, Resub*, int);
+extern void	regsub(char*, char*, int, Resub*, int);
+
+extern int	rregexec(Reprog*, Rune*, Resub*, int);
+extern void	rregsub(Rune*, Rune*, Resub*, int);
+
+#endif
--- /sys/src/cmd/rc/unix/include/utf.h	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/include/utf.h	Thu Feb 28 21:06:37 2013
@@ -0,0 +1,51 @@
+#ifndef _UTFH_
+#define _UTFH_ 1
+
+typedef unsigned short Rune;	/* 16 bits */
+
+enum
+{
+	UTFmax		= 3,		/* maximum bytes per rune */
+	Runesync	= 0x80,		/* cannot represent part of a UTF sequence (<) */
+	Runeself	= 0x80,		/* rune and UTF sequences are the same (<) */
+	Runeerror	= 0x80,		/* decoding error in UTF */
+};
+
+/*
+ * rune routines
+ */
+extern	int	runetochar(char*, Rune*);
+extern	int	chartorune(Rune*, char*);
+extern	int	runelen(long);
+extern	int	runenlen(Rune*, int);
+extern	int	fullrune(char*, int);
+extern	int	utflen(char*);
+extern	int	utfnlen(char*, long);
+extern	char*	utfrune(char*, long);
+extern	char*	utfrrune(char*, long);
+extern	char*	utfutf(char*, char*);
+extern	char*	utfecpy(char*, char*, char*);
+
+extern	Rune*	runestrcat(Rune*, Rune*);
+extern	Rune*	runestrchr(Rune*, Rune);
+extern	int	runestrcmp(Rune*, Rune*);
+extern	Rune*	runestrcpy(Rune*, Rune*);
+extern	Rune*	runestrncpy(Rune*, Rune*, long);
+extern	Rune*	runestrecpy(Rune*, Rune*, Rune*);
+extern	Rune*	runestrdup(Rune*);
+extern	Rune*	runestrncat(Rune*, Rune*, long);
+extern	int	runestrncmp(Rune*, Rune*, long);
+extern	Rune*	runestrrchr(Rune*, Rune);
+extern	long	runestrlen(Rune*);
+extern	Rune*	runestrstr(Rune*, Rune*);
+
+extern	Rune	tolowerrune(Rune);
+extern	Rune	totitlerune(Rune);
+extern	Rune	toupperrune(Rune);
+extern	int	isalpharune(Rune);
+extern	int	islowerrune(Rune);
+extern	int	isspacerune(Rune);
+extern	int	istitlerune(Rune);
+extern	int	isupperrune(Rune);
+
+#endif
--- /sys/src/cmd/rc/unix/makefile	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/makefile	Thu Feb 28 23:30:35 2013
@@ -0,0 +1,64 @@
+O=o
+TARG=rc
+COMMONOFILES=\
+	code.$O\
+	exec.$O\
+	getflags.$O\
+	glob.$O\
+	here.$O\
+	io.$O\
+	lex.$O\
+	pcmd.$O\
+	pfnc.$O\
+	simple.$O\
+	subr.$O\
+	trap.$O\
+	tree.$O\
+	var.$O\
+	havefork.$O\
+
+PLAN9OFILES=plan9.$O\
+
+UNIXOFILES=unix.$O\
+
+OFILES=$(COMMONOFILES) $(UNIXOFILES) y.tab.$O
+
+HFILES=rc.h\
+	x.tab.h\
+	io.h\
+	exec.h\
+	fns.h\
+
+YFILES=syn.y
+
+BIN=/$objtype/bin
+
+UPDATE=\
+	mkfile\
+	$HFILES\
+	${COMMONOFILES:%.$O=%.c}\
+	${UNIXOFILES:%.$O=%.c}\
+	${PLAN9OFILES:%.$O=%.c}\
+	$YFILES\
+	${TARG:%=/386/bin/%}\
+
+CC=cc
+CFLAGS= -c -w -Iinclude
+LD=cc
+
+YFLAGS=-d -S
+
+rc: $(OFILES)
+	$(CC) -o rc $(OFILES)
+x.tab.h: y.tab.h
+	cmp -s x.tab.h y.tab.h || cp y.tab.h x.tab.h
+
+clean:
+	rm -f [$OS].out *.[$OS] [xy].tab.? y.debug $TARG
+
+regress: $O.out
+	cd test
+	mk
+
+unregress:
+	for(test in test/*.test) rc $test >$test.out
--- /sys/src/cmd/rc/unix/mkfile	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/mkfile	Thu Feb 28 21:53:07 2013
@@ -0,0 +1,68 @@
+</$objtype/mkfile
+
+TARG=rc
+COMMONOFILES=\
+	code.$O\
+	exec.$O\
+	getflags.$O\
+	glob.$O\
+	here.$O\
+	io.$O\
+	lex.$O\
+	pcmd.$O\
+	pfnc.$O\
+	simple.$O\
+	subr.$O\
+	trap.$O\
+	tree.$O\
+	var.$O\
+	havefork.$O\
+
+PLAN9OFILES=plan9.$O\
+
+UNIXOFILES=unix.$O\
+
+OFILES=$COMMONOFILES $UNIXOFILES y.tab.$O
+
+HFILES=rc.h\
+	x.tab.h\
+	io.h\
+	exec.h\
+	fns.h\
+
+YFILES=syn.y
+
+BIN=/$objtype/bin
+
+UPDATE=\
+	mkfile\
+	$HFILES\
+	${COMMONOFILES:%.$O=%.c}\
+	${UNIXOFILES:%.$O=%.c}\
+	${PLAN9OFILES:%.$O=%.c}\
+	$YFILES\
+	${TARG:%=/386/bin/%}\
+
+CC=pcc
+CFLAGS= -c -B -Iinclude
+LD=pcc
+
+</sys/src/cmd/mkone
+
+YFLAGS=-d -S
+
+x.tab.h: y.tab.h
+	cmp -s x.tab.h y.tab.h || cp y.tab.h x.tab.h
+
+clean:V:
+	rm -f [$OS].out *.[$OS] [xy].tab.? y.debug $TARG
+
+regress: $O.out
+	cd test
+	mk
+
+unregress:V:
+	for(test in test/*.test) rc $test >$test.out
+
+listing:
+	pr mkfile $HFILES $FILES $FILES9 $FILESUNIX $YFILES|lp -du
--- /sys/src/cmd/rc/unix/rc.h	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/rc.h	Fri Mar  1 00:22:27 2013
@@ -0,0 +1,172 @@
+/*
+ * Plan9 is defined for plan 9
+ * Unix is defined for Unix
+ * Please don't litter the code with ifdefs.  The two below should be enough.
+ */
+#define	Unix
+#ifdef	Plan9
+#include <u.h>
+#include <libc.h>
+#define	NSIG	32
+#define	SIGINT	2
+#define	SIGQUIT	3
+#endif
+
+#ifdef Unix
+#define _BSD_EXTENSION
+#define _PLAN9_SOURCE
+#define _POSIX_SOURCE
+#define _RESEARCH_SOURCE
+#define _SUSV2_SOURCE
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <lib9.h>
+#include <signal.h>
+#include <inttypes.h>
+
+#ifndef NSIG
+#define NSIG 32
+#endif
+
+#define uintptr uintptr_t
+#endif
+
+#ifndef ERRMAX
+#define ERRMAX 128
+#endif
+
+#define	YYMAXDEPTH	500
+#ifndef PAREN
+#include "x.tab.h"
+#endif
+typedef struct tree tree;
+typedef struct word word;
+typedef struct io io;
+typedef union code code;
+typedef struct var var;
+typedef struct list list;
+typedef struct redir redir;
+typedef struct thread thread;
+typedef struct builtin builtin;
+
+#ifdef Plan9
+#pragma incomplete word
+#pragma incomplete io
+#endif
+
+struct tree{
+	int	type;
+	int	rtype, fd0, fd1;		/* details of REDIR PIPE DUP tokens */
+	char	*str;
+	int	quoted;
+	int	iskw;
+	tree	*child[3];
+	tree	*next;
+};
+tree *newtree(void);
+tree *token(char*, int), *klook(char*), *tree1(int, tree*);
+tree *tree2(int, tree*, tree*), *tree3(int, tree*, tree*, tree*);
+tree *mung1(tree*, tree*), *mung2(tree*, tree*, tree*);
+tree *mung3(tree*, tree*, tree*, tree*), *epimung(tree*, tree*);
+tree *simplemung(tree*), *heredoc(tree*);
+void freetree(tree*);
+tree *cmdtree;
+
+/*
+ * The first word of any code vector is a reference count.
+ * Always create a new reference to a code vector by calling codecopy(.).
+ * Always call codefree(.) when deleting a reference.
+ */
+union code{
+	void	(*f)(void);
+	int	i;
+	char	*s;
+};
+
+char *promptstr;
+int doprompt;
+
+#define	NTOK	8192
+
+char tok[NTOK];
+
+#define	APPEND	1
+#define	WRITE	2
+#define	READ	3
+#define	HERE	4
+#define	DUPFD	5
+#define	CLOSE	6
+#define RDWR	7
+
+struct var{
+	char	*name;		/* ascii name */
+	word	*val;		/* value */
+	int	changed;
+	code	*fn;		/* pointer to function's code vector */
+	int	fnchanged;
+	int	pc;		/* pc of start of function */
+	var	*next;		/* next on hash or local list */
+};
+var *vlook(char*), *gvlook(char*), *newvar(char*, var*);
+
+#define	NVAR	521
+
+var *gvar[NVAR];		/* hash for globals */
+
+#define	new(type)	((type *)emalloc(sizeof(type)))
+
+void *emalloc(long);
+void *Malloc(ulong);
+void efree(void *);
+
+#define	NOFILE	128		/* should come from <param.h> */
+
+struct here{
+	tree	*tag;
+	char	*name;
+	struct here *next;
+};
+int mypid;
+
+/*
+ * Glob character escape in strings:
+ *	In a string, GLOB must be followed by *?[ or GLOB.
+ *	GLOB* matches any string
+ *	GLOB? matches any single character
+ *	GLOB[...] matches anything in the brackets
+ *	GLOBGLOB matches GLOB
+ */
+#define	GLOB	((char)0x01)
+/*
+ * onebyte(c), twobyte(c), threebyte(c)
+ * Is c the first character of a one- two- or three-byte utf sequence?
+ */
+#define	onebyte(c)	((c&0x80)==0x00)
+#define	twobyte(c)	((c&0xe0)==0xc0)
+#define	threebyte(c)	((c&0xf0)==0xe0)
+
+char **argp;
+char **args;
+int nerror;		/* number of errors encountered during compilation */
+int doprompt;		/* is it time for a prompt? */
+/*
+ * Which fds are the reading/writing end of a pipe?
+ * Unfortunately, this can vary from system to system.
+ * 9th edition Unix doesn't care, the following defines
+ * work on plan 9.
+ */
+#define	PRD	0
+#define	PWR	1
+char Rcmain[], Fdprefix[];
+/*
+ * How many dot commands have we executed?
+ * Used to ensure that -v flag doesn't print rcmain.
+ */
+int ndot;
+char *getstatus(void);
+int lastc;
+int lastword;
--- /sys/src/cmd/rc/unix/rcmain	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/rcmain	Thu Feb 28 23:27:18 2013
@@ -0,0 +1,34 @@
+# rcmain: unix version
+if(~ $#home 0) home=$HOME
+if(~ $#ifs 0) ifs=' 	
+'
+switch($#prompt){
+case 0
+	prompt=('% ' '	')
+case 1
+	prompt=($prompt '	')
+}
+if(~ $rcname ?.out) prompt=('broken! ' '	')
+if(flag p) path=/bin
+if not {
+	finit
+	if(~ $#path 0) path=(. /bin /usr/bin /usr/local/bin)
+}
+fn sigexit
+if(! ~ $#cflag 0){
+	if(flag l && test -r $home/lib/profile) . $home/lib/profile
+	status=''
+	eval $cflag
+}
+if not if(flag i){
+	if(flag l && test -r $home/lib/profile) . $home/lib/profile
+	status=''
+	if(! ~ $#* 0) . $*
+	. -i /dev/fd/0
+}
+if not if(~ $#* 0) . /dev/fd/0
+if not{
+	status=''
+	. $*
+}
+exit $status
--- /sys/src/cmd/rc/unix/run	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/run	Thu Feb 28 22:03:58 2013
@@ -0,0 +1,20 @@
+yacc -d syn.y
+cmp -s x.tab.h y.tab.h || cp y.tab.h x.tab.h
+cc -w -c -Iinclude code.c
+cc -w -c -Iinclude exec.c
+cc -w -c -Iinclude getflags.c
+cc -w -c -Iinclude glob.c
+cc -w -c -Iinclude here.c
+cc -w -c -Iinclude io.c
+cc -w -c -Iinclude lex.c
+cc -w -c -Iinclude pcmd.c
+cc -w -c -Iinclude pfnc.c
+cc -w -c -Iinclude simple.c
+cc -w -c -Iinclude subr.c
+cc -w -c -Iinclude trap.c
+cc -w -c -Iinclude tree.c
+cc -w -c -Iinclude var.c
+cc -w -c -Iinclude havefork.c
+cc -w -c -Iinclude unix.c
+cc -w -c -Iinclude y.tab.c
+cc  -o rc code.o exec.o getflags.o glob.o here.o io.o lex.o pcmd.o pfnc.o simple.o subr.o trap.o tree.o var.o havefork.o unix.o y.tab.o
--- /sys/src/cmd/rc/unix/simple.c	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/simple.c	Thu Feb 28 23:36:07 2013
@@ -0,0 +1,508 @@
+/*
+ * Maybe `simple' is a misnomer.
+ */
+#include "rc.h"
+#include "getflags.h"
+#include "exec.h"
+#include "io.h"
+#include "fns.h"
+/*
+ * Search through the following code to see if we're just going to exit.
+ */
+int
+exitnext(void){
+	union code *c=&runq->code[runq->pc];
+	while(c->f==Xpopredir) c++;
+	return c->f==Xexit;
+}
+
+void
+Xsimple(void)
+{
+	word *a;
+	thread *p = runq;
+	var *v;
+	struct builtin *bp;
+	int pid;
+	globlist();
+	a = runq->argv->words;
+	if(a==0){
+		Xerror1("empty argument list");
+		return;
+	}
+	if(flag['x'])
+		pfmt(err, "%v\n", p->argv->words); /* wrong, should do redirs */
+	v = gvlook(a->word);
+	if(v->fn)
+		execfunc(v);
+	else{
+		if(strcmp(a->word, "builtin")==0){
+			if(count(a)==1){
+				pfmt(err, "builtin: empty argument list\n");
+				setstatus("empty arg list");
+				poplist();
+				return;
+			}
+			a = a->next;
+			popword();
+		}
+		for(bp = Builtin;bp->name;bp++)
+			if(strcmp(a->word, bp->name)==0){
+				(*bp->fnc)();
+				return;
+			}
+		if(exitnext()){
+			/* fork and wait is redundant */
+			pushword("exec");
+			execexec();
+			Xexit();
+		}
+		else{
+			flush(err);
+			Updenv();	/* necessary so changes don't go out again */
+			if((pid = execforkexec()) < 0){
+				Xerror("try again");
+				return;
+			}
+
+			/* interrupts don't get us out */
+			poplist();
+			while(Waitfor(pid, 1) < 0)
+				;
+		}
+	}
+}
+struct word nullpath = { "", 0};
+
+void
+doredir(redir *rp)
+{
+	if(rp){
+		doredir(rp->next);
+		switch(rp->type){
+		case ROPEN:
+			if(rp->from!=rp->to){
+				Dup(rp->from, rp->to);
+				close(rp->from);
+			}
+			break;
+		case RDUP:
+			Dup(rp->from, rp->to);
+			break;
+		case RCLOSE:
+			close(rp->from);
+			break;
+		}
+	}
+}
+
+word*
+searchpath(char *w)
+{
+	word *path;
+	if(strncmp(w, "/", 1)==0
+	|| strncmp(w, "#", 1)==0
+	|| strncmp(w, "./", 2)==0
+	|| strncmp(w, "../", 3)==0
+	|| (path = vlook("path")->val)==0)
+		path=&nullpath;
+	return path;
+}
+
+void
+execexec(void)
+{
+	popword();	/* "exec" */
+	if(runq->argv->words==0){
+		Xerror1("empty argument list");
+		return;
+	}
+	doredir(runq->redir);
+	Execute(runq->argv->words, searchpath(runq->argv->words->word));
+	poplist();
+}
+
+void
+execfunc(var *func)
+{
+	word *starval;
+	popword();
+	starval = runq->argv->words;
+	runq->argv->words = 0;
+	poplist();
+	start(func->fn, func->pc, runq->local);
+	runq->local = newvar(strdup("*"), runq->local);
+	runq->local->val = starval;
+	runq->local->changed = 1;
+}
+
+int
+dochdir(char *word)
+{
+	/* report to /dev/wdir if it exists and we're interactive */
+	static int wdirfd = -2;
+	if(chdir(word)<0) return -1;
+	if(flag['i']!=0){
+		if(wdirfd==-2)	/* try only once */
+			wdirfd = open("/dev/wdir", OWRITE|OCEXEC);
+		if(wdirfd>=0) {
+#ifdef Unix
+			fcntl(wdirfd, F_SETFD, FD_CLOEXEC);
+#endif
+			write(wdirfd, word, strlen(word));
+		}
+	}
+	return 1;
+}
+
+void
+execcd(void)
+{
+	word *a = runq->argv->words;
+	word *cdpath;
+	char dir[512];
+	setstatus("can't cd");
+	cdpath = vlook("cdpath")->val;
+	switch(count(a)){
+	default:
+		pfmt(err, "Usage: cd [directory]\n");
+		break;
+	case 2:
+		if(a->next->word[0]=='/' || cdpath==0)
+			cdpath=&nullpath;
+		for(;cdpath;cdpath = cdpath->next){
+			strcpy(dir, cdpath->word);
+			if(dir[0])
+				strcat(dir, "/");
+			strcat(dir, a->next->word);
+			if(dochdir(dir)>=0){
+				if(strlen(cdpath->word)
+				&& strcmp(cdpath->word, ".")!=0)
+					pfmt(err, "%s\n", dir);
+				setstatus("");
+				break;
+			}
+		}
+		if(cdpath==0)
+			pfmt(err, "Can't cd %s: %r\n", a->next->word);
+		break;
+	case 1:
+		a = vlook("home")->val;
+		if(count(a)>=1){
+			if(dochdir(a->word)>=0)
+				setstatus("");
+			else
+				pfmt(err, "Can't cd %s: %r\n", a->word);
+		}
+		else
+			pfmt(err, "Can't cd -- $home empty\n");
+		break;
+	}
+	poplist();
+}
+
+void
+execexit(void)
+{
+	switch(count(runq->argv->words)){
+	default:
+		pfmt(err, "Usage: exit [status]\nExiting anyway\n");
+	case 2:
+		setstatus(runq->argv->words->next->word);
+	case 1:	Xexit();
+	}
+}
+
+void
+execshift(void)
+{
+	int n;
+	word *a;
+	var *star;
+	switch(count(runq->argv->words)){
+	default:
+		pfmt(err, "Usage: shift [n]\n");
+		setstatus("shift usage");
+		poplist();
+		return;
+	case 2:
+		n = atoi(runq->argv->words->next->word);
+		break;
+	case 1:
+		n = 1;
+		break;
+	}
+	star = vlook("*");
+	for(;n && star->val;--n){
+		a = star->val->next;
+		efree(star->val->word);
+		efree((char *)star->val);
+		star->val = a;
+		star->changed = 1;
+	}
+	setstatus("");
+	poplist();
+}
+
+int
+octal(char *s)
+{
+	int n = 0;
+	while(*s==' ' || *s=='\t' || *s=='\n') s++;
+	while('0'<=*s && *s<='7') n = n*8+*s++-'0';
+	return n;
+}
+
+int
+mapfd(int fd)
+{
+	redir *rp;
+	for(rp = runq->redir;rp;rp = rp->next){
+		switch(rp->type){
+		case RCLOSE:
+			if(rp->from==fd)
+				fd=-1;
+			break;
+		case RDUP:
+		case ROPEN:
+			if(rp->to==fd)
+				fd = rp->from;
+			break;
+		}
+	}
+	return fd;
+}
+union code rdcmds[4];
+
+void
+execcmds(io *f)
+{
+	static int first = 1;
+	if(first){
+		rdcmds[0].i = 1;
+		rdcmds[1].f = Xrdcmds;
+		rdcmds[2].f = Xreturn;
+		first = 0;
+	}
+	start(rdcmds, 1, runq->local);
+	runq->cmdfd = f;
+	runq->iflast = 0;
+}
+
+void
+execeval(void)
+{
+	char *cmdline, *s, *t;
+	int len = 0;
+	word *ap;
+	if(count(runq->argv->words)<=1){
+		Xerror1("Usage: eval cmd ...");
+		return;
+	}
+	eflagok = 1;
+	for(ap = runq->argv->words->next;ap;ap = ap->next)
+		len+=1+strlen(ap->word);
+	cmdline = emalloc(len);
+	s = cmdline;
+	for(ap = runq->argv->words->next;ap;ap = ap->next){
+		for(t = ap->word;*t;) *s++=*t++;
+		*s++=' ';
+	}
+	s[-1]='\n';
+	poplist();
+	execcmds(opencore(cmdline, len));
+	efree(cmdline);
+}
+union code dotcmds[14];
+
+void
+execdot(void)
+{
+	int iflag = 0;
+	int fd;
+	list *av;
+	thread *p = runq;
+	char *zero;
+	static int first = 1;
+	char file[512];
+	word *path;
+	if(first){
+		dotcmds[0].i = 1;
+		dotcmds[1].f = Xmark;
+		dotcmds[2].f = Xword;
+		dotcmds[3].s="0";
+		dotcmds[4].f = Xlocal;
+		dotcmds[5].f = Xmark;
+		dotcmds[6].f = Xword;
+		dotcmds[7].s="*";
+		dotcmds[8].f = Xlocal;
+		dotcmds[9].f = Xrdcmds;
+		dotcmds[10].f = Xunlocal;
+		dotcmds[11].f = Xunlocal;
+		dotcmds[12].f = Xreturn;
+		first = 0;
+	}
+	else
+		eflagok = 1;
+	popword();
+	if(p->argv->words && strcmp(p->argv->words->word, "-i")==0){
+		iflag = 1;
+		popword();
+	}
+	/* get input file */
+	if(p->argv->words==0){
+		Xerror1("Usage: . [-i] file [arg ...]");
+		return;
+	}
+	zero = strdup(p->argv->words->word);
+	popword();
+	fd=-1;
+	for(path = searchpath(zero);path;path = path->next){
+		strcpy(file, path->word);
+		if(file[0])
+			strcat(file, "/");
+		strcat(file, zero);
+		if((fd = open(file, 0))>=0) break;
+		if(strcmp(file, "/dev/stdin")==0){	/* for sun & ucb */
+			fd = Dup1(0);
+			if(fd>=0)
+				break;
+		}
+	}
+	if(fd<0){
+		pfmt(err, "%s: ", zero);
+		setstatus("can't open");
+		Xerror(".: can't open");
+		return;
+	}
+	/* set up for a new command loop */
+	start(dotcmds, 1, (struct var *)0);
+	pushredir(RCLOSE, fd, 0);
+	runq->cmdfile = zero;
+	runq->cmdfd = openfd(fd);
+	runq->iflag = iflag;
+	runq->iflast = 0;
+	/* push $* value */
+	pushlist();
+	runq->argv->words = p->argv->words;
+	/* free caller's copy of $* */
+	av = p->argv;
+	p->argv = av->next;
+	efree((char *)av);
+	/* push $0 value */
+	pushlist();
+	pushword(zero);
+	ndot++;
+}
+
+void
+execflag(void)
+{
+	char *letter, *val;
+	switch(count(runq->argv->words)){
+	case 2:
+		setstatus(flag[runq->argv->words->next->word[0]]?"":"flag not set");
+		break;
+	case 3:
+		letter = runq->argv->words->next->word;
+		val = runq->argv->words->next->next->word;
+		if(strlen(letter)==1){
+			if(strcmp(val, "+")==0){
+				flag[(uchar)letter[0]] = flagset;
+				break;
+			}
+			if(strcmp(val, "-")==0){
+				flag[(uchar)letter[0]] = 0;
+				break;
+			}
+		}
+	default:
+		Xerror1("Usage: flag [letter] [+-]");
+		return;
+	}
+	poplist();
+}
+
+void
+execwhatis(void){	/* mildly wrong -- should fork before writing */
+	word *a, *b, *path;
+	var *v;
+	struct builtin *bp;
+	char file[512];
+	struct io out[1];
+	int found, sep;
+	a = runq->argv->words->next;
+	if(a==0){
+		Xerror1("Usage: whatis name ...");
+		return;
+	}
+	setstatus("");
+	out->fd = mapfd(1);
+	out->bufp = out->buf;
+	out->ebuf = &out->buf[NBUF];
+	out->strp = 0;
+	for(;a;a = a->next){
+		v = vlook(a->word);
+		if(v->val){
+			pfmt(out, "%s=", a->word);
+			if(v->val->next==0)
+				pfmt(out, "%q\n", v->val->word);
+			else{
+				sep='(';
+				for(b = v->val;b && b->word;b = b->next){
+					pfmt(out, "%c%q", sep, b->word);
+					sep=' ';
+				}
+				pfmt(out, ")\n");
+			}
+			found = 1;
+		}
+		else
+			found = 0;
+		v = gvlook(a->word);
+		if(v->fn)
+			pfmt(out, "fn %s %s\n", v->name, v->fn[v->pc-1].s);
+		else{
+			for(bp = Builtin;bp->name;bp++)
+				if(strcmp(a->word, bp->name)==0){
+					pfmt(out, "builtin %s\n", a->word);
+					break;
+				}
+			if(!bp->name){
+				for(path = searchpath(a->word);path;path = path->next){
+					strcpy(file, path->word);
+					if(file[0])
+						strcat(file, "/");
+					strcat(file, a->word);
+					if(Executable(file)){
+						pfmt(out, "%s\n", file);
+						break;
+					}
+				}
+				if(!path && !found){
+					pfmt(err, "%s: not found\n", a->word);
+					setstatus("not found");
+				}
+			}
+		}
+	}
+	poplist();
+	flush(err);
+}
+
+void
+execwait(void)
+{
+	switch(count(runq->argv->words)){
+	default:
+		Xerror1("Usage: wait [pid]");
+		return;
+	case 2:
+		Waitfor(atoi(runq->argv->words->next->word), 0);
+		break;
+	case 1:
+		Waitfor(-1, 0);
+		break;
+	}
+	poplist();
+}
--- /sys/src/cmd/rc/unix/words	Thu Jan  1 01:00:00 1970
+++ /sys/src/cmd/rc/unix/words	Fri Mar  1 00:33:38 2013
@@ -0,0 +1,8 @@
+How to build rc on unix:
+
+ramfs
+dircp .. /tmp
+cd /tmp/unix
+dircp . ..
+cd ..
+run
--- /sys/src/cmd/rc/unix.c	Wed Jun 27 00:55:21 2007
+++ /sys/src/cmd/rc/unix.c	Fri Mar  1 00:21:28 2013
@@ -4,11 +4,16 @@
  *	upper case letter.
  */
 #include "rc.h"
+#include "io.h"
 #include "exec.h"
+#include "getflags.h"
 #include <errno.h>
+
 char Rcmain[]="/usr/lib/rcmain";
 char Fdprefix[]="/dev/fd/";
-int execumask(), execfinit();
+
+void execfinit(void);
+
 struct builtin Builtin[] = {
 	"cd",		execcd,
 	"whatis",	execwhatis,
@@ -39,7 +44,10 @@
 	*t = c;
 	return v;
 }
-Vinit(){
+
+void
+Vinit(void)
+{
 	extern char **environ;
 	char *s;
 	char **env = environ;
@@ -60,8 +68,12 @@
 		}
 	}
 }
+
 char **envp;
-Xrdfn(){
+
+void
+Xrdfn(void)
+{
 	char *s;
 	int len;
 	for(;*envp;envp++){
@@ -84,8 +96,12 @@
 	}
 	Xreturn();
 }
+
 union code rdfns[4];
-execfinit(){
+
+void
+execfinit(void)
+{
 	static int first = 1;
 	if(first){
 		rdfns[0].i = 1;
@@ -98,23 +114,29 @@
 	envp = environp;
 	start(rdfns, 1, runq->local);
 }
-cmpenv(a, b)
-char **a, **b;
+
+int
+cmpenv(const void *aa, const void *ab)
 {
+	char **a = aa, **b = ab;
+
 	return strcmp(*a, *b);
 }
 
-char*
-*mkenv()
+char **
+mkenv(void)
 {
 	char **env, **ep, *p, *q;
 	struct var **h, *v;
 	struct word *a;
 	int nvar = 0, nchr = 0, sep;
+
 	/*
-	 * Slightly kludgy loops look at locals then globals
+	 * Slightly kludgy loops look at locals then globals.
+	 * locals no longer exist - geoff
 	 */
-	for(h = var-1;h!=&var[NVAR];h++) for(v = h>=var?*h:runq->local;v;v = v->next){
+	for(h = gvar-1; h != &gvar[NVAR]; h++)
+	for(v = h >= gvar? *h: runq->local; v ;v = v->next){
 		if((v==vlook(v->name)) && v->val){
 			nvar++;
 			nchr+=strlen(v->name)+1;
@@ -129,7 +151,8 @@
 	env = (char **)emalloc((nvar+1)*sizeof(char *)+nchr);
 	ep = env;
 	p = (char *)&env[nvar+1];
-	for(h = var-1;h!=&var[NVAR];h++) for(v = h>=var?*h:runq->local;v;v = v->next){
+	for(h = gvar-1; h != &gvar[NVAR]; h++)
+	for(v = h >= gvar? *h: runq->local;v;v = v->next){
 		if((v==vlook(v->name)) && v->val){
 			*ep++=p;
 			q = v->name;
@@ -156,7 +179,7 @@
 		}
 	}
 	*ep = 0;
-	qsort((char *)env, nvar, sizeof ep[0], cmpenv);
+	qsort((void *)env, nvar, sizeof ep[0], cmpenv);
 	return env;	
 }
 char *sigmsg[] = {
@@ -182,11 +205,15 @@
 /* 19 SIGCONT */ "Process continued",
 /* 20 SIGCHLD */ "Child death",
 };
-Waitfor(pid, persist){
+
+void
+Waitfor(int pid, int persist)
+{
 	int wpid, sig;
 	struct thread *p;
 	int wstat;
 	char wstatstr[12];
+
 	for(;;){
 		errno = 0;
 		wpid = wait(&wstat);
@@ -226,31 +253,39 @@
 	}
 }
 
-char*
-*mkargv(a)
+char **
+mkargv(a)
 register struct word *a;
 {
 	char **argv = (char **)emalloc((count(a)+2)*sizeof(char *));
 	char **argp = argv+1;	/* leave one at front for runcoms */
-	for(;a;a = a->next) *argp++=a->word;
+
+	for(;a;a = a->next)
+		*argp++=a->word;
 	*argp = 0;
 	return argv;
 }
-Updenv(){}
-Execute(args, path)
-register struct word *args, *path;
+
+void
+Updenv(void)
+{
+}
+
+void
+Execute(struct word *args, struct word *path)
 {
 	char *msg="not found";
 	int txtbusy = 0;
 	char **env = mkenv();
 	char **argv = mkargv(args);
 	char file[512];
+
 	for(;path;path = path->next){
 		strcpy(file, path->word);
 		if(file[0])
 			strcat(file, "/");
 		strcat(file, argv[1]);
-	ReExec:
+ReExec:
 		execve(file, argv+1, env);
 		switch(errno){
 		case ENOEXEC:
@@ -279,7 +314,9 @@
 	efree((char *)env);
 	efree((char *)argv);
 }
+
 #define	NDIR	14		/* should get this from param.h */
+
 Globsize(p)
 register char *p;
 {
@@ -296,10 +333,14 @@
 	}
 	return isglob?globlen:0;
 }
+
 #include <sys/types.h>
-#include <ndir.h>
+#include <dirent.h>
+
 #define	NDIRLIST	50
+
 DIR *dirlist[NDIRLIST];
+
 Opendir(name)
 char *name;
 {
@@ -311,21 +352,25 @@
 		}
 	return -1;
 }
-Readdir(f, p, onlydirs)
-int f;
-void *p;
-int onlydirs;		/* ignored, just advisory */
+
+int
+Readdir(int f, char *p, int onlydirs)
 {
-	struct direct *dp = readdir(dirlist[f]);
+	struct dirent *dp = readdir(dirlist[f]);
+
 	if(dp==0)
 		return 0;
 	strcpy(p, dp->d_name);
 	return 1;
 }
-Closedir(f){
+
+void
+Closedir(int f)
+{
 	closedir(dirlist[f]);
 	dirlist[f] = 0;
 }
+
 char *Signame[] = {
 	"sigexit",	"sighup",	"sigint",	"sigquit",
 	"sigill",	"sigtrap",	"sigiot",	"sigemt",
@@ -338,21 +383,25 @@
 	0,
 };
 
-int
-gettrap(sig)
+void
+gettrap(int sig)
 {
 	signal(sig, gettrap);
 	trap[sig]++;
 	ntrap++;
 	if(ntrap>=NSIG){
 		pfmt(err, "rc: Too many traps (trap %d), dumping core\n", sig);
-		signal(SIGIOT, (int (*)())0);
-		kill(getpid(), SIGIOT);
+		signal(SIGABRT, (void (*)())0);
+		kill(getpid(), SIGABRT);
 	}
 }
-Trapinit(){
+
+void
+Trapinit(void)
+{
 	int i;
-	int (*sig)();
+	void (*sig)();
+
 	if(1 || flag['d']){	/* wrong!!! */
 		sig = signal(SIGINT, gettrap);
 		if(sig==SIG_IGN)
@@ -366,18 +415,19 @@
 		}
 	}
 }
+
 Unlink(name)
 char *name;
 {
 	return unlink(name);
 }
 Write(fd, buf, cnt)
-void *buf;
+char *buf;
 {
 	return write(fd, buf, cnt);
 }
 Read(fd, buf, cnt)
-void *buf;
+char *buf;
 {
 	return read(fd, buf, cnt);
 }
@@ -405,10 +455,11 @@
 /*
  * Wrong:  should go through components of a|b|c and return the maximum.
  */
-Exit(stat)
-register char *stat;
+void
+Exit(char *stat)
 {
 	int n = 0;
+
 	while(*stat){
 		if(*stat!='|'){
 			if(*stat<'0' || '9'<*stat)
@@ -422,16 +473,25 @@
 Eintr(){
 	return errno==EINTR;
 }
-Noerror(){
+
+void
+Noerror()
+{
 	errno = 0;
 }
 Isatty(fd){
 	return isatty(fd);
 }
-Abort(){
+
+void
+Abort()
+{
 	abort();
 }
-execumask(){		/* wrong -- should fork before writing */
+
+void
+execumask(void)		/* wrong -- should fork before writing */
+{
 	int m;
 	struct io out[1];
 	switch(count(runq->argv->words)){
@@ -455,15 +515,32 @@
 	setstatus("");
 	poplist();
 }
+
+void
 Memcpy(a, b, n)
-void *a, *b;
-long n;
+char *a, *b;
 {
 	memmove(a, b, n);
 }
 
 void*
-Malloc(n)
+Malloc(unsigned long n)
 {
 	return (void *)malloc(n);
+}
+
+void
+errstr(char *buf, int len)
+{
+	strncpy(buf, strerror(errno), len);
+}
+
+int
+needsrcquote(int c)
+{
+	if(c <= ' ')
+		return 1;
+	if(strchr("`^#*[]=|\\?${}()'<>&;", c))
+		return 1;
+	return 0;
 }