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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36436 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 768dfa09bec812c734c775213c2b34aef3698026..f17cd221ac3430d06bf7ed7c4d0e7cee60e0adc3 100644 (file)
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-03-25)
+(last updated 2011-04-01)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -106296,9 +106296,9 @@ Institute
     Jacek Drobiecki
       j.drobiecki&emcom.pl
 26680
-  General Dynamics UK Limited
-    Ron Smith
-      ron.smith&generaldynamics.uk.com
+  General Dynamics United Kingdom Limited
+    Jonathan Hansford
+      jonathan.hansford&generaldynamics.uk.com
 26681
   Phi Theta Kappa International Honor Society
     Larry Olin Horn
@@ -124554,7 +124554,7 @@ Decentralization / Helenic Public Administra
     Brian Foster
       brian&fosterhardware.com
 31243
-  Interhost ANS
+  Interhost AS
     Asbjørn Sannes
       asbjorn.sannes&interhost.no
 31244
@@ -142392,9 +142392,9 @@ Decentralization / Helenic Public Administra
     chunguo li
       lichunguo&ceopen.cn
 35702
-  Optical Components & Systems
-    Vlaznev Dmitry
-      soft&oco.ru
+  NTO IRE-Polus, Ltd. (previous was 'Optical Components & Systems')
+    Alexander Gutor
+      sanya.gutor&gmail.com
 35703
   JSC DevLab
     Kolesnyk Oleksij
@@ -150116,7 +150116,7 @@ Decentralization / Helenic Public Administra
     Matthew Lambie
       mlambie&thefrontiergroup.com.au
 37633
-  Bolnišnica Golnik KOPA
+  Bolnisnica Golnik KOPA
     Tomaz Knific
       tomaz.knific&klinika-golnik.si
 37634
@@ -150175,6 +150175,194 @@ Decentralization / Helenic Public Administra
   Ministry of Interior - UAE (Governmental Entity)
     Major General Matar Salem Bin Msaeed Al Neyadi – ICT Director  / Dr. Haider Khalid A.A. Al-Ameed – Senior ICT Advisor 
       hkameed&adpolice.gov.ae
+37648
+  Kalmia Technology Co, LLC
+    Alton Brantley
+      alton.brantley&gmail.com
+37649
+  Helium Inc.
+    Tracy Flynn
+      tflynn&helium.com
+37650
+  Shared Technology Services Group, Inc.
+    Venu Venugopal
+      vvenugopal&stsgi.com
+37651
+  JoyStem Web Services Private Limited
+    Chandra Sekhar Challapilla
+      sekhar&joystem.com
+37652
+  I-TECH
+    Alex McGee
+      camcgee&uw.edu
+37653
+  Lamby
+    Stefan Lamby
+      support&lamby.de
+37654
+  Moccu GmbH
+    Thomas Walter
+      admin&moccu.com
+37655
+  Far South Networks
+    Michael Walton
+      mike&farsouthnet.com
+37656
+  Broxtowe Borough Council
+    Stuart Chaffin
+      Stuart.Chaffin&broxtowe.gov.uk
+37657
+  Erskine Design
+    Phil Howell
+      dev&erskinedesign.com
+37658
+  Czech National Bank
+    Martin Podstata
+      certificateadmins&cnb.cz
+37659
+  ControlCircle Ltd.
+    Andy Coates
+      MonitoringTeam&ControlCircle.com
+37660
+  Unit of Research of Technologies of Information and Communication (UTIC)
+    Heithem Abbes
+      heithem.abbes&gmail.com
+37661
+  Transcon Electronic Systems spol. s r. o.
+    Martin Persich
+      persich&transcon.cz
+37662
+  Ablerex Electronic Co., Ltd.
+    Fred Hsu
+      fred&ablerex.com.tw
+37663
+  nGen - Niagara Interactive Media Generator
+    Thomas Madej 
+      tmadej&ngen-niagara.com
+37664
+  Zone de Police Midi
+    Jacques Struelens
+      dir.tel&zpz5341.irisnet.be
+37665
+  R. W. Beckett Corporation
+    John Bohan
+      engineering&beckettenergy.com
+37666
+  Airebullas C.B.
+    Juan Gomez Melero
+      airebullas&airebullas.es
+37667
+  Office of the Auditor General of Norway
+    Stig Kristiansen
+      stig.kristiansen&riksrevisjonen.no
+37668
+  bit GmbH
+    M. Botzem
+      m.botzem&bit-germany.de
+37669
+  FONDEMI
+    Marco Saldivia
+      msaldivia&fondemi.gob.ve
+37670
+  Barling Bay LLC
+    Perry Minchew
+      pminchew&barlingbay.com
+37671
+  The Biostatistics Center - GWU
+    Aria Bamdad
+      aria&bsc.gwu.edu
+37672
+  VERSCOM INTERNATIONAL HOLDING UK LLP
+    Aydin Pirinccioglu
+      snmp.pen&verscom.com
+37673
+  Estech Systems, Inc.
+    Brian Berger
+      bberger&esi-estech.com
+37674
+  Heineken International
+    Jan den Otter
+      Jan.denotter&heineken.com
+37675
+  LoveBee
+    Phillip O'Donnell
+      admin.iana&lovebee.co.nz
+37676
+  Sutunam Co., Ltd.
+    Martin PANEL
+      network&sutunam.com
+37677
+  Linuxsoft s.r.o.
+    Ales Hakl
+      adh&linuxsoft.cz
+37678
+  Hall Research
+    Justin Ireland
+      justin&hallresearch.com
+37679
+  AGILiCOM
+    Frédéric BAHUAUD
+      f.bahuaud&agilicom.fr
+37680
+  Scott Ellis
+    Scott Ellis
+      mail&scottellis.com.au
+37681
+  Sinefa Pty Ltd
+    John Bothe
+      john&sinefa.com
+37682
+  AlexxHost
+    Alexey bogomolov
+      alexx.b84&gmail.com
+37683
+  TimoCom Soft- und Hardware GmbH
+    Marco Haack
+      hostmaster&timocom.com
+37684
+  Grupo Alsa
+    Pablo Alvarez Menendez
+      guardia&alsa.es
+37685
+  Online Marketing Solutions AG
+    Michael Junghans
+      notify&online-marketing-solutions.com
+37686
+  Lookout Mobile Security, Inc.
+    Ryan Dooley
+      ryan.dooley&mylookout.com
+37687
+  Bethesda Memorial Hospital
+    Leslie Durham
+      leslie.durham&bethesdahealthcare.com
+37688
+  ACE Computer bv
+    Stephen Day
+      stephen&ace.nl
+37689
+  unixtastic
+    Stephen Day
+      sd&unixtastic.com
+37690
+  JOTATEC
+    Julio Cesar Gomes da Silva
+      julio&jotatec.com.br
+37691
+  Broadcast Devices Inc.
+    Ron Kumetz
+      ron&broadcast-devices.com
+37692
+  StringIT
+    Jeroen Dekkers
+      iana&stringit.nl
+37693
+  Brattleboro Memorial Hospital
+    Jonathan Farina
+      jfarina&bmhvt.org
+37694
+  Tsubakimoto Chain Co.
+    Kohei Yamada
+      mitaro.sales&mitaro.gr.jp
 
 
 End of Document

diff --git a/manuf b/manuf
index 9e2f2b8c03e83876497dee89baefdd5f1f97e74d..0c56597a069ea0acdfacfb129d2fdbf3b8f221c1 100644 (file)
--- a/manuf
+++ b/manuf
@@ -8092,7 +8092,7 @@
 00:1F:88       FmsForce               # FMS Force Measuring Systems AG
 00:1F:89       Signalio               # Signalion GmbH
 00:1F:8A       EllionDi               # Ellion Digital Inc.
-00:1F:8B       Storspee               # Storspeed, Inc.
+00:1F:8B       CacheIq                # Cache IQ
 00:1F:8C       Ccs                    # CCS Inc.
 00:1F:8D       Ingenieu               # Ingenieurbuero Stark GmbH und Ko. KG
 00:1F:8E       MetrisUs               # Metris USA Inc.
@@ -14281,11 +14281,15 @@
 00:50:C2:DE:B0:00/36   RuwischK               # Ruwisch & Kollegen GmbH
 00:50:C2:DE:C0:00/36   Vendnova               # VendNovation LLC
 00:50:C2:DE:D0:00/36   LeeLaser               # Lee Laser
-00:50:C2:DE:E0:00/36   Intercel               # InterCEL Pty Ltd
 00:50:C2:DE:F0:00/36   Powersen               # Powersense A/S
 00:50:C2:DF:00:00/36   KoncarEl               # Koncar Electrical Engineering Institute
 00:50:C2:DF:10:00/36   Saia-Bur               # Saia-Burgess Controls AG
 00:50:C2:DF:20:00/36   Instrume               # Instrument Concepts
+00:50:C2:DF:30:00/36   Insevis                # INSEVIS GmbH
+00:50:C2:DF:40:00/36   PotterEl               # Potter Electric Signal
+00:50:C2:DF:50:00/36   Etherlig               # EtherLight
+00:50:C2:DF:60:00/36   HinoEngi               # HINO ENGINEERING, INC
+00:50:C2:DF:70:00/36   Combilen               # Combilent
 00:50:C4       Imd
 00:50:C5       AdsTechn               # ADS Technologies, Inc
 00:50:C6       LoopTele               # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -16694,6 +16698,7 @@
 28:85:2D       TouchNet               # Touch Networks
 28:89:15       Cashguar               # CashGuard Sverige AB
 28:93:FE       Cisco                  # Cisco Systems
+28:A5:74       MillerEl               # Miller Electric Mfg. Co.
 28:C0:DA       JuniperN               # Juniper Networks
 28:CC:FF       Corporac               # Corporacion Empresarial Altra SL
 28:CD:4C       Individu               # Individual Computers GmbH
@@ -16760,6 +16765,7 @@
 34:08:04       D-Link                 # D-Link Corporation
 34:15:9E       Apple                  # Apple, Inc
 34:21:09       JensenSc               # Jensen Scandinavia AS
+34:29:EA       McdElect               # MCD ELECTRONICS SP. Z O.O.
 34:68:4A       Terawork               # Teraworks Co., Ltd.
 34:6F:92       WhiteRod               # White Rodgers Division
 34:78:77       O-NetCom               # O-NET Communications(Shenzhen) Limited
@@ -16788,6 +16794,7 @@
 38:16:D1       SamsungE               # Samsung Electronics Co.,Ltd
 38:22:9D       PirelliB               # PIRELLI BROADBAND SOLUTIONS 
 38:22:D6       H3cTechn               # H3C Technologies Co., Limited
+38:26:CD       Andtek                 # ANDTEK  
 38:31:AC       Weg
 38:52:1A       Alcatel-               # Alcatel-Lucent 7705
 38:58:0C       Panacces               # Panaccess Systems GmbH
@@ -16836,6 +16843,7 @@
 3C:B1:5B       Avaya                  # Avaya, Inc
 3C:B1:7F       Wattwatc               # Wattwatchers Pty Ld
 3C:C0:C6       D&Amp;BA               # d&b audiotechnik GmbH
+3C:D9:2B       HewlettP               # Hewlett Packard
 3C:DF:1E       Cisco                  # Cisco Systems
 3C:E5:A6       Hangzhou               # Hangzhou H3C Technologies Co., Ltd.
 3C:EA:4F       2wire
@@ -17006,6 +17014,7 @@
 50:C5:8D       JuniperN               # Juniper Networks
 50:C9:71       GnNetcom               # GN Netcom A/S
 50:CE:75       MeasyEle               # Measy Electronics Ltd
+50:D6:D7       Takahata               # Takahata Precision
 50:E5:49       Giga-Byt               # GIGA-BYTE TECHNOLOGY CO.,LTD.
 50:EB:1A       BrocadeC               # Brocade Communications Systems, Inc
 50:F0:03       OpenStac               # Open Stack, Inc.
@@ -17051,8 +17060,10 @@
 58:67:1A       Barnes&N               # BARNES&NOBLE.COM
 58:6D:8F       Cisco-Li               # Cisco-Linksys, LLC
 58:6E:D6       Private
+58:75:21       CjscRtso               # CJSC RTSoft
 58:8D:09       Cisco                  # Cisco Systems
 58:94:6B       IntelCor               # Intel Corporate
+58:98:35       Technico               # Technicolor
 58:A7:6F       Id                     # iD corporation
 58:B0:35       Apple                  # Apple, Inc
 58:B9:E1       Crystalf               # Crystalfontz America, Inc.
@@ -17502,6 +17513,7 @@
 8C:7B:9D       Apple
 8C:7C:B5       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 8C:7C:FF       BrocadeC               # Brocade Communications Systems, Inc.
+8C:82:A8       InsigmaT               # Insigma Technology Co.,Ltd
 8C:84:01       Private
 8C:89:A5       Micro-St               # Micro-Star INT'L CO., LTD
 8C:90:D3       AlcatelL               # Alcatel Lucent
@@ -17536,6 +17548,7 @@
 90:7F:61       ChiconyE               # Chicony Electronics Co., Ltd.
 90:84:0D       Apple                  # Apple, Inc
 90:88:A2       IonicsTe               # IONICS TECHNOLOGY ME LTDA
+90:8D:1D       GhTechno               # GH Technologies
 90:90:3C       TrisonTe               # TRISON TECHNOLOGY CORPORATION
 90:90:60       RsiVideo               # RSI VIDEO TECHNOLOGIES
 90:A2:DA       GheoSa                 # GHEO SA
@@ -17567,6 +17580,7 @@
 94:88:54       TexasIns               # Texas Instruments
 94:8B:03       EagetInn               # EAGET Innovation and Technology Co., Ltd.
 94:8D:50       BeamexOy               # Beamex Oy Ab
+94:8F:EE       HughesTe               # Hughes Telematics, Inc.
 94:9C:55       AltaData               # Alta Data Technologies
 94:A7:BC       Bodymedi               # BodyMedia, Inc.
 94:AA:B8       JoviewBe               # Joview(Beijing) Technology Co. Ltd.
@@ -17591,6 +17605,8 @@
 98:2D:56       Resoluti               # Resolution Audio
 98:30:00       BeijingK               # Beijing KEMACOM Technologies Co., Ltd.
 98:35:B8       Assemble               # Assembled Products Corporation
+98:42:46       GemtekTe               # Gemtek Technology Co., Ltd.
+98:4B:4A       Motorola               # Motorola Mobility Inc.
 98:4B:E1       HewlettP               # Hewlett Packard
 98:4E:97       Starligh               # Starlight Marketing (H. K.) Ltd.
 98:59:45       TexasIns               # Texas Instruments
@@ -17614,6 +17630,7 @@
 9C:18:74       NokiaDan               # Nokia Danmark A/S
 9C:22:0E       TascanSe               # TASCAN Service GmbH
 9C:28:BF       Continen               # Continental Automotive Czech Republic s.r.o.
+9C:41:7C       HameTech               # Hame  Technology Co.,  Limited 
 9C:45:63       DimepSis               # DIMEP Sistemas
 9C:4A:7B       Nokia                  # Nokia Corporation
 9C:4E:20       Cisco                  # Cisco Systems
@@ -17623,6 +17640,7 @@
 9C:5D:95       VtcElect               # VTC Electronics Corp.
 9C:5E:73       CalibreU               # Calibre UK Ltd
 9C:64:5E       HarmanCo               # Harman Consumer Group
+9C:6A:BE       QeesAps                # QEES ApS.
 9C:75:14       WildixSr               # Wildix srl
 9C:77:AA       Nadasnv
 9C:80:7D       Syscable               # SYSCABLE Korea Inc.
@@ -17766,6 +17784,7 @@ AC:83:17        Shenzhen               # Shenzhen Furtunetel Communication Co., Ltd
 AC:83:F0       MagentaV               # Magenta Video Networks
 AC:86:74       OpenMesh               # Open Mesh, Inc.
 AC:86:7E       CreateNe               # Create New Technology (HK) Limited Company
+AC:8A:CD       RogerDWe               # ROGER D.Wensker, G.Wensker sp.j.
 AC:93:2F       Nokia                  # Nokia Corporation
 AC:9A:96       LantiqDe               # Lantiq Deutschland GmbH
 AC:9B:84       SmakTecn               # Smak Tecnologia e Automacao
@@ -17773,6 +17792,7 @@ AC:A0:16        Cisco                  # Cisco Systems
 AC:AB:8D       LyngsoMa               # Lyngso Marine A/S
 AC:BE:75       UfineTec               # Ufine Technologies Co.,Ltd.
 AC:BE:B6       Visualed               # Visualedge Technology Co., Ltd.
+AC:C9:35       Ness                   # Ness Corporation
 AC:CA:54       TelldusT               # Telldus Technologies AB
 AC:CA:BA       Midokura               # Midokura Co., Ltd. 
 AC:CE:8F       HwaYaoTe               # HWA YAO TECHNOLOGIES CO., LTD
@@ -17822,10 +17842,12 @@ B4:41:7A      Shenzhen               # ShenZhen Gongjin Electronics Co.,Ltd
 B4:4C:C2       NrElectr               # NR ELECTRIC CO., LTD
 B4:52:53       SeagateT               # Seagate Technology
 B4:58:61       CremoteL               # CRemote, LLC
+B4:5C:A4       Thing-Ta               # Thing-talk Wireless Communication Technologies Corporation Limited
 B4:74:9F       AskeyCom               # askey computer corp
 B4:82:FE       AskeyCom               # Askey Computer Corp
 B4:99:BA       HewlettP               # Hewlett Packard
 B4:A4:E3       Cisco                  # Cisco Systems
+B4:A5:A9       Modi                   # MODI GmbH
 B4:AA:4D       Ensequen               # Ensequence, Inc.
 B4:B0:17       Avaya                  # Avaya, Inc
 B4:B5:AF       MinsungE               # Minsung Electronics
@@ -17935,6 +17957,7 @@ C0:D0:44        Sagemcom
 C0:E4:22       TexasIns               # Texas Instruments
 C0:EA:E4       Sonicwal               # Sonicwall
 C0:F8:DA       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
+C4:0F:09       HermesEl               # Hermes electronic GmbH
 C4:10:8A       RuckusWi               # Ruckus Wireless
 C4:16:FA       Prysm                  # Prysm Inc
 C4:17:FE       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
@@ -17942,6 +17965,7 @@ C4:19:8B        Dominion               # Dominion Voting Systems Corporation
 C4:1E:CE       HmiSourc               # HMI Sources Ltd.
 C4:24:2E       Galvanic               # Galvanic Applied Sciences Inc
 C4:2C:03       Apple
+C4:36:DA       Rustelet               # Rusteletech Ltd.
 C4:3D:C7       Netgear
 C4:46:19       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd. 
 C4:4A:D0       Fireflie               # FIREFLIES RTLS
@@ -18027,6 +18051,7 @@ CC:8C:E3        TexasIns               # Texas Instruments
 CC:96:A0       HuaweiDe               # Huawei Device Co., Ltd
 CC:9E:00       Nintendo               # Nintendo Co., Ltd.
 CC:AF:78       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
+CC:B5:5A       Fraunhof               # Fraunhofer ITWM
 CC:B8:88       AnbSecur               # AnB Securite s.a.
 CC:BE:71       Optilogi               # OptiLogix BV
 CC:C6:2B       Tri-Syst               # Tri-Systems Corporation
@@ -18051,6 +18076,7 @@ D0:75:BE        RenoA&Am               # Reno A&E
 D0:7D:E5       ForwardP               # Forward Pay Systems, Inc.
 D0:89:99       Apcon                  # APCON, Inc.
 D0:93:F8       Stonestr               # Stonestreet One LLC
+D0:9B:05       Emtronix
 D0:A3:11       Neuberge               # Neuberger Geb�udeautomation GmbH
 D0:AF:B6       LinktopT               # Linktop Technology Co., LTD
 D0:B3:3F       Shenzhen               # SHENZHEN TINNO MOBILE TECHNOLOGY CO.,LTD.
@@ -18070,6 +18096,7 @@ D4:12:96        AnobitTe               # Anobit Technologies Ltd.
 D4:1F:0C       TviVisio               # TVI Vision Oy
 D4:28:B2       Iobridge               # ioBridge, Inc.
 D4:2C:3D       SkyLight               # Sky Light Digital Limited
+D4:3A:E9       Dongguan               # DONGGUAN ipt INDUSTRIAL CO., LTD
 D4:3D:67       CarmaInd               # Carma Industries Inc.
 D4:4C:24       Vuppalam               # Vuppalamritha Magnetic Components LTD
 D4:4C:A7       Informte               # Informtekhnika & Communication, LLC
@@ -18122,6 +18149,7 @@ D8:75:33        Nokia                  # Nokia Corporation
 D8:76:0A       Escort                 # Escort, Inc.
 D8:79:88       HonHaiPr               # Hon Hai Precision Ind. Co., Ltd.
 D8:95:2F       TexasIns               # Texas Instruments
+D8:97:3B       EmersonN               # Emerson Network Power Embedded Power
 D8:9D:B9       Emegatec               # eMegatech International Corp.
 D8:9E:3F       Apple                  # Apple, Inc.
 D8:A2:5E       Apple
@@ -18262,6 +18290,7 @@ E8:B7:48        Cisco                  # Cisco Systems
 E8:BA:70       Cisco                  # Cisco Systems
 E8:BE:81       Sagemcom
 E8:C2:29       H-Displa               # H-Displays (MSC) Bhd
+E8:C3:20       AustcoCo               # Austco Communication Systems Pty Ltd
 E8:DA:AA       Videohom               # VideoHome Technology Corp.
 E8:DF:F2       Prf                    # PRF Co., Ltd.
 E8:E0:8F       Gravotec               # GRAVOTECH MARKING SAS

diff --git a/services b/services
index 8790fcfc18e97b6eed72aad284d1098a92e4e5af..1ab9e4bf167c6a27d824f9ddc1dee29aad4fdcf7 100644 (file)
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 
 PORT NUMBERS
 
-(last updated 2011-03-21)
+(last updated 2011-03-31)
 
 The port numbers are divided into three ranges: the Well Known Ports,
 the Registered Ports, and the Dynamic and/or Private Ports.
@@ -2087,7 +2087,7 @@ pkix-3-ca-ra    829/udp    PKIX-3 CA/RA
 #                         Carlisle Adams <Cadams&entrust.com>
 netconf-ssh     830/tcp    NETCONF over SSH
 netconf-ssh     830/udp    NETCONF over SSH
-#                          [RFC4742]
+#                          [RFC-ietf-netconf-rfc4742bis-08.txt]
 netconf-beep    831/tcp    NETCONF over BEEP 
 netconf-beep    831/udp    NETCONF over BEEP
 #                          [RFC4744]
@@ -2603,7 +2603,7 @@ winpoplanmess   1152/udp   Winpopup LAN Messenger
 #                          Vitali Fomine <info&winpopup-lan-messenger.com> November 2005
 c1222-acse      1153/tcp   ANSI C12.22 Port
 c1222-acse      1153/udp   ANSI C12.22 Port
-#                          [RFC-c1222-transport-over-ip-07.txt]
+#                          [RFC6142]
 resacommunity   1154/tcp   Community Service
 resacommunity   1154/udp   Community Service
 #                          StÈphane MONS <stephane.mons&free.fr> September 2005
@@ -12464,7 +12464,7 @@ targus-getdata3 5203/udp   TARGUS GetData 3
 #                          Bill Rettig <WRettig&efji.com> 19 May 2010
 #               5221/udp   Reserved
 xmpp-client     5222/tcp   XMPP Client Connection
-#                          [RFC-ietf-xmpp-3920bis-22.txt]
+#                          [RFC6120]
 #               5222/udp   Reserved
 hpvirtgrp      5223/tcp   HP Virtual Machine Group Management
 hpvirtgrp      5223/udp   HP Virtual Machine Group Management
@@ -12538,7 +12538,7 @@ kpdp            5253/tcp   Kohler Power Device Protocol
 #                          Abhay Rajaram <Abhay_Rajaram&3Com.com> March 2003
 #               5266-5268  Unassigned
 xmpp-server     5269/tcp   XMPP Server Connection
-#                          [RFC-ietf-xmpp-3920bis-22.txt]
+#                          [RFC6120]
 #               5269/udp   Reserved
 xmp             5270/tcp   Cartographer XMP
 xmp             5270/udp   Cartographer XMP
@@ -17043,15 +17043,12 @@ References
            Transfer Part 3 (MTP3) - User Adaptation Layer (M3UA)", RFC 4666, September 
            2006.
 
-[RFC4744]  E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible 
-           Exchange Protocol (BEEP)", RFC 4744, December 2006.
-
-[RFC4742]  M. Wasserman and T. Goddard, "Using the NETCONF Configuration Protocol over 
-           Secure Shell (SSH)", RFC 4742, December 2006.
-
 [RFC4743]  T. Goddard, "Using the Network Configuration Protocol (NETCONF) Over the 
            Simple Object Access Protocol (SOAP)", RFC 4743, December 2006.
 
+[RFC4744]  E. Lear and K. Crozier, "Using the NETCONF Protocol over Blocks Extensible 
+           Exchange Protocol (BEEP)", RFC 4744, December 2006.
+
 [RFC4727]  B. Fenner, "Experimental values In IPv4, IPv6, ICMPv4, ICMPv6,
            UDP and TCP Headers",  RFC 4727, November 2006.
 
@@ -17176,10 +17173,12 @@ References
 
 [RFC6046]  K. Moriarty and B. Trammell, "Transport of Real-time Inter-network Defense 
            (RID) Messages", RFC 6045, November 2010.
+
+[RFC6120]  P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", 
+           RFC 6120, March 2011.
             
-[RFC-c1222-transport-over-ip-07.txt]
-            A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", 
-            RFC XXXX, Month Year. 
+[RFC6142]   A. Moise, J. Brodkin, "ANSI C12.22, IEEE 1703 and MC12.22 Transport Over IP", 
+            RFC 6142, March 2011.
 
 [RFC6143]  T. Richardson, J. Levine, "The Remote Framebuffer Protocol", RFC 6143, 
            March 2011.
@@ -17187,13 +17186,14 @@ References
 [RFC-chroboczek-babel-routing-protocol-05.txt]
             J. Chroboczek, "The Babel Routing Protocol", RFC XXXX, Month Year. 
 
-[RFC-ietf-xmpp-3920bis-22.txt]
-            P. Saint-Andre, "Extensible Messaging and Presence Protocol (XMPP): Core", 
-            RFC XXXX, Month Year.
 
 [RFC-ietf-mediactrl-sip-control-framework-12.txt]
             C. Boulton, T. Melanchuk, S. McGlashan, "Media Control Channel Framework", 
             RFC XXXX, Month Year.
 
+[RFC-ietf-netconf-rfc4742bis-08.txt]
+            M. Wasserman, T. Goddard, "Using the NETCONF Configuration Protocol over 
+            Secure Shell (SSH)", RFC XXXX, Month Year.
+
 []