[Automatic manuf, services and enterprise-numbers update for 2011-12-25]
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 25 Dec 2011 15:03:26 +0000 (15:03 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 25 Dec 2011 15:03:26 +0000 (15:03 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40290 f5534014-38df-0310-8fa8-9805f1628bb7

epan/enterprise-numbers
manuf
services

index ea19e5edf13f6e068123c69ce3a0e1acef4f70b4..151ae19d5163660646a532f30be20a3e029bd7b8 100644 (file)
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-12-16)
+(last updated 2011-12-25)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -10895,8 +10895,8 @@ Decimal
       stuartmg&newscorp.com
 2722
   Georgia Tech Research Institute
-    David Huggins
-      David.Huggins&gtri.gatech.edu
+    Joshua Roys
+      Joshua.Roys&gtri.gatech.edu
 2723
   Guerrilla Mail, Inc.
     Michael Cohen
@@ -14610,9 +14610,9 @@ Decimal
     Claes Berg
       Claes.Berg&knowit.se
 3652
-  Pan Dacom Networking AG
-    B.Schwalm
-      schwalm&eup.pandacom.de
+  Pan Dacom Direkt GmbH (previous was 'Pan Dacom Networking AG')
+    Michael Lindner
+      lindner&pandacomdirekt.de
 3653
   Cirque Networks, Inc.
     Kevin Hoff
@@ -66700,8 +66700,8 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
       eosys&vizzavi.it
 16787
   T-Systems Nova International GmbH
-    Kirti Singh-Kurbel
-      Kirti.Singh-Kurbel&t-systems.com
+    Andreas Kelling
+      Andreas.Kelling&t-systems.com
 16788
   Information Technology Center (KYTP), Aristotle Univ. of Thessaloniki GREECE
     Athanasios E. Siachoudis
@@ -156066,6 +156066,182 @@ Decentralization / Helenic Public Administra
   itunic consulting
     Bernhard Rekemeier
       br01&itunic.de
+39121
+  ElringKlinger AG
+    Christian Segor
+      oidmaster&elringklinger.com
+39122
+  Framehawk Inc.
+    Michael Martin
+      michael.martin&framehawk.com
+39123
+  Two Degrees Mobile Ltd
+    Tim West
+      IANA_Pen&2degreesmobile.co.nz
+39124
+  Kaweah Delta Health Care District
+    Steven Larkin
+      itdirector&kdhcd.org
+39125
+  Instituto Superior de Engenharia do Porto (ISEP)
+    Nuno Pereira
+      nap&isep.ipp.pt
+39126
+  DCA Inc
+    Mike Chatterton
+      mikec&dcainc.com
+39127
+  Mercury Insurance Group
+    Roy Hegge
+      rhegge&mercuryinsurance.com
+39128
+  ALLIANZ LIFE INSURANCE OF NORTH AMERICA
+    Drew Pierce
+      drew.pierce&allianzlife.com
+39129
+  Reiknistofa i Vedurfraedi
+    Thor Sigurdsson
+      thor&belgingur.is
+39130
+  Century Software (M) Sdn Bhd 
+    Mark Rees
+      mark&centurysoftware.com.my
+39131
+  Sistemas Informaticos Abiertos S.A.
+    Jorge Cea
+      jcea&sia.es
+39132
+  Camair-Co
+    Jean-Francis AHANDA
+      francis.ahanda&camair-co.net
+39133
+  Kamsoft S.A.
+    Bartłomiej Syryjczyk
+      bsyryjczyk&kamsoft.pl
+39134
+  Apex
+    Stijn Schouteten
+      stijn&apex-audio.be
+39135
+  U.S. Bancorp
+    Kenneth Payne
+      kenneth.payne&usbank.com
+39136
+  Adams State College
+    Randall Smith
+      rbsmith&adams.edu
+39137
+  ameria GmbH
+    Pavel Shumarov
+      admin-department&ameria.de
+39138
+  Santa Barbara County Education Office
+    Sharon Van Gundy
+      dnsadmin&sbceo.org
+39139
+  nPario Inc
+    Joerg Hallmann
+      joerg&npario.com
+39140
+  Interra Systems, Inc.
+    Shelly Adhikari
+      shelly&InterraSystems.com
+39141
+  Qice Technology Co. Ltd
+    judd wang
+      jdwang&qicetech.com
+39142
+  Nian Electronic Company
+    Morteza Sadr
+      idm&nianelectronic.com
+39143
+  LARS
+    Mariusz Kokocinski
+      ca&lars.pl
+39144
+  Nextouch, Inc.
+    Young D. Moon
+      ydmoon&ntnextouch.com
+39145
+  Innovative Circuit Technology Ltd.
+    Kevin Bolster
+      technical.contact&ictcorporate.com
+39146
+  Watchdog Software Pty Limited
+    Richard Giddey
+      support&watchdogsoftware.com.au
+39147
+  intratop
+    Thorsten Eisinger
+      thorsten.eisinger&intratop.de
+39148
+  Agjencia Kombetare e Shoqerise se Informacionit
+    Fisnik Kruja 
+      fisnik.kruja&akshi.gov.al
+39149
+  broadAngle, LLC
+    Garrison Atkisson
+      garrison&broadangle.com
+39150
+  B.O.S. Software Service und Vertrieb GmbH
+    Jahn Fuchs
+      jahn.fuchs&bossoftware.de
+39151
+  Autorité des Marchés Financiers
+    Erik Ableson
+      e.ableson&amf-france.org
+39152
+  DVT - Daten-Verarbeitung-Tirol GmbH
+    Florian Sailer
+      florian.sailer&tirol.gv.at
+39153
+  WAYF - Where Are You From
+    Christian Hannested
+      sekretariat&wayf.dk
+39154
+  SwiftStack
+    Joe Arnold
+      joe&swiftstack.com
+39155
+  Mango DSP, Inc.
+    Eldor Reif - Dir. of Professional Services and Product Management
+      ereif&mangodspinc.com
+39156
+  PROSCOPE Corporation
+    Hideki Fujimura
+      fujimura&proscope.co.jp
+39157
+  DERMALOG IDENTIFICATION SYSTEMS GMBH
+    Innocents Sia
+      Innocents.Sia&dermalog.com
+39158
+  Akouto
+    Dominic Chorafakis
+      dom&akouto.com
+39159
+  Redpoint Software
+    James Rhodes
+      jrhodes&redpointsoftware.com.au
+39160
+  PointRed Telecom Ltd.
+    Vijayakumar Perumal
+      vijayakumar&pointred.co
+39161
+  Precision Infomatic
+    Charan Narayanan
+      ncharan86&gmail.com
+39162
+  WEOLO
+    Paolo Decarlini
+      paolo.decarlini&nimix.it
+39163
+  U-BTech Solutions
+    Ilan Lanz
+      ilan&u-btech.com
+39164
+  Cires21 S.L.
+    Manuel Cardeñas Cano
+      mcardenas&cires21.com
 
 
 End of Document
diff --git a/manuf b/manuf
index b9576cf01b977adcb7153833c4862d7f24768843..29f033e18b560c9f44957e3bdca13c2d65bd1c90 100644 (file)
--- a/manuf
+++ b/manuf
 00:50:C2:EF:F0:00/36   Zephyrus               # Zephyrus Electronics LTD.
 00:50:C2:F0:00:00/36   SyscomIn               # Syscom Instruments
 00:50:C2:F0:10:00/36   MangoDsp               # Mango DSP, Inc
+00:50:C2:F0:20:00/36   Bmr
+00:50:C2:F0:30:00/36   WrenSoun               # Wren Sound Systems
+00:50:C2:F0:40:00/36   KinkiRoe               # KINKI ROENTGEN INDUSTRIAL CO.,LTD
+00:50:C2:F0:50:00/36   EsiVentu               # ESI Ventures
+00:50:C2:F0:60:00/36   Micro-Ke               # Micro-Key BV
+00:50:C2:F0:70:00/36   IconRese               # Icon Research Ltd
+00:50:C2:F0:80:00/36   AplexTec               # Aplex Technology Inc.
+00:50:C2:F0:90:00/36   Wheatsto               # Wheatstone Corporation
 00:50:C4       Imd
 00:50:C5       AdsTechn               # ADS Technologies, Inc
 00:50:C6       LoopTele               # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
 18:14:20       TebSas                 # TEB SAS
 18:14:56       Nokia                  # Nokia Corporation
 18:17:14       Daewoois
+18:19:3F       TamtronO               # Tamtron Oy
 18:20:32       Apple                  # Apple, Inc.
 18:28:61       AirtiesW               # AirTies Wireless Networks
 18:2B:05       8dTechno               # 8D Technologies
 18:2C:91       ConceptD               # Concept Development, Inc.
+18:34:51       Apple                  # Apple, Inc.
 18:38:25       WuhanLin               # Wuhan Lingjiu High-tech Co.,Ltd.
 18:3B:D2       BydPreci               # BYD Precision Manufacture Company Ltd.
 18:3D:A2       IntelCor               # Intel Corporate
 44:D3:CA       Cisco                  # Cisco Systems
 44:D6:3D       TalariNe               # Talari Networks
 44:D8:32       Azurewav               # Azurewave Technologies, Inc.
+44:D8:84       Apple                  # Apple, Inc.
 44:DC:91       PlanexCo               # PLANEX COMMUNICATIONS INC.
 44:DC:CB       Semindia               # SEMINDIA SYSTEMS PVT LTD
 44:E0:8E       CiscoSpv               # Cisco SPVTG
 50:79:5B       Interexp               # Interexport Telecomunicaciones S.A.
 50:7D:02       Biodit
 50:87:B8       Nuvyyo                 # Nuvyyo Inc
+50:8A:42       UptmateT               # Uptmate Technology Co., LTD
 50:8A:CB       Shenzhen               # SHENZHEN MAXMADE TECHNOLOGY CO., LTD.
 50:93:4F       GradualT               # Gradual Tecnologia Ltda.
 50:97:72       Westingh               # Westinghouse Digital
 58:35:D9       Cisco                  # Cisco Systems
 58:3C:C6       Omnealit               # Omneality Ltd.
 58:42:E4       SigmaInt               # Sigma International General Medical Apparatus, LLC.
+58:48:C0       Coflec
 58:49:BA       ChitaiEl               # Chitai Electronic Corp.
 58:4C:19       Chongqin               # Chongqing Guohong Technology Development Company Limited
 58:4C:EE       DigitalO               # Digital One Technologies, Limited
 64:16:F0       Shehzhen               # Shehzhen Huawei Communication Technologies Co., Ltd.
 64:1A:22       Heliospe               # Heliospectra/Woodhill Investments
 64:1E:81       Dowslake               # Dowslake Microsystems
+64:20:0C       Apple                  # Apple, Inc.
 64:27:37       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd. 
 64:31:50       Hewlett-               # Hewlett-Packard Company
 64:31:7E       Dexin                  # Dexin Corporation
 70:A1:91       Trendset               # Trendsetter Medical, LLC
 70:A4:1C       Advanced               # Advanced Wireless Dynamics S.L.
 70:A6:6A       ProxDyna               # Prox Dynamics AS
+70:AA:B2       Research               # Research In Motion
 70:B0:35       Shenzhen               # Shenzhen Zowee Technology Co., Ltd
 70:B0:8C       ShenouCo               # Shenou Communication Equipment Co.,Ltd
 70:B2:65       HiltronS               # Hiltron s.r.l.
 7C:F0:BA       Linkwell               # Linkwell Telesystems Pvt Ltd
 7C:F4:29       Nuuo                   # NUUO Inc. 
 80:00:10       AttBellL               # ATT BELL LABORATORIES
+80:0A:06       Comtec                 # COMTEC co.,ltd
 80:14:40       SunlitSy               # Sunlit System Technology Corp
 80:16:B7       BrunelUn               # Brunel University
 80:17:7D       NortelNe               # Nortel Networks
 90:E6:BA       AsustekC               # ASUSTek COMPUTER INC.
 90:EA:60       SpiLaser               # SPI Lasers Ltd 
 90:F2:78       RadiusGa               # Radius Gateway
+90:F4:C1       RandMcna               # Rand McNally
 90:F6:52       Tp-LinkT               # TP-LINK TECHNOLOGIES CO., LTD.
 90:FB:5B       Avaya                  # Avaya, Inc
 90:FB:A6       HonHaiPr               # Hon Hai Precision Ind.Co.Ltd
 98:F8:DB       MariniIm               # Marini Impianti Industriali s.r.l.
 98:FC:11       Cisco-Li               # Cisco-Linksys, LLC
 98:FE:03       Ericsson               # Ericsson - North America
+9C:02:98       SamsungE               # Samsung Electronics Co.,Ltd 
 9C:18:74       NokiaDan               # Nokia Danmark A/S
 9C:1F:DD       Accupix                # Accupix Inc.
 9C:22:0E       TascanSe               # TASCAN Service GmbH
@@ -18929,6 +18947,7 @@ BC:CD:45        Voismart
 BC:D5:B6       D2dTechn               # d2d technologies
 BC:E0:9D       Eoslink
 BC:E5:9F       Waterwor               # WATERWORLD Technology Co.,LTD
+BC:EA:2B       Citycom                # CityCom GmbH
 BC:F2:AF       Devolo                 # devolo AG
 BC:FE:8C       Altronic               # Altronic, LLC
 BC:FF:AC       Topcon                 # TOPCON CORPORATION
@@ -18952,6 +18971,7 @@ C0:62:6B        Cisco                  # Cisco Systems
 C0:6C:0F       DobbsSta               # Dobbs Stanford
 C0:7E:40       Shenzhen               # SHENZHEN XDK COMMUNICATION EQUIPMENT CO.,LTD
 C0:83:0A       2wire
+C0:84:7A       Apple                  # Apple, Inc.
 C0:8B:6F       SISistem               # S I Sistemas Inteligentes Eletronicos Ltda
 C0:91:32       PatriotM               # Patriot Memory
 C0:91:34       Procurve               # ProCurve Networking by HP
@@ -19004,6 +19024,7 @@ C4:85:08        Intel                  # Intel Corporation
 C4:93:00       8devices
 C4:93:13       100fioNe               # 100fio networks technology llc
 C4:95:A2       Shenzhen               # SHENZHEN WEIJIU INDUSTRY AND TRADE DEVELOPMENT CO., LTD
+C4:98:05       MinieumN               # Minieum Networks, Inc
 C4:AA:A1       SummitDe               # SUMMIT DEVELOPMENT, spol.s r.o.
 C4:B5:12       GeneralE               # General Electric Digital Energy
 C4:C1:9F       National               # National Oilwell Varco Instrumentation, Monitoring, and Optimization (NOV IMO)
@@ -19075,6 +19096,7 @@ C8:DF:7C        Nokia                  # Nokia Corporation
 C8:EE:08       TangtopT               # TANGTOP TECHNOLOGY CO.,LTD
 C8:EF:2E       BeijingG               # Beijing Gefei Tech. Co., Ltd 
 C8:F4:06       Avaya                  # Avaya, Inc
+C8:F7:04       Building               # Building Block Video
 C8:F7:33       IntelCor               # Intel Corporate
 C8:F9:81       SenecaSR               # Seneca s.r.l.
 C8:F9:F9       Cisco                  # Cisco Systems
@@ -19530,6 +19552,7 @@ EC:FE:7E        Blueradi               # BlueRadios, Inc.
 F0:00:7F       Janz-Con               # Janz - Contadores de Energia, SA
 F0:02:2B       Chrontel
 F0:02:48       Smartebu               # SmarteBuilding
+F0:07:86       Shandong               # Shandong Bittel Electronics Co., Ltd
 F0:08:F1       SamsungE               # Samsung Electronics Co.,Ltd
 F0:13:C3       Shenzhen               # SHENZHEN FENDA TECHNOLOGY CO., LTD
 F0:1C:13       LgElectr               # LG Electronics
@@ -19605,6 +19628,7 @@ F4:5F:D4        CiscoSpv               # Cisco SPVTG
 F4:5F:F7       DqTechno               # DQ Technology Inc.
 F4:63:49       Diffon                 # Diffon Corporation
 F4:6D:04       AsustekC               # ASUSTek COMPUTER INC.
+F4:73:CA       Conversi               # Conversion Sound Inc.
 F4:76:26       Viltechm               # Viltechmeda UAB 
 F4:7A:CC       Solidfir               # SolidFire, Inc.
 F4:87:71       Infoblox
@@ -19660,6 +19684,7 @@ F8:B5:99        Guangzho               # Guangzhou CHNAVS Digital Technology Co.,Ltd
 F8:C0:01       JuniperN               # Juniper Networks
 F8:C0:91       Highgate               # Highgates Technology
 F8:C6:78       Carefusi               # Carefusion
+F8:D0:BD       SamsungE               # Samsung Electronics Co.,Ltd
 F8:D1:11       Tp-LinkT               # TP-LINK TECHNOLOGIES CO., LTD.
 F8:D3:A9       AxanNetw               # AXAN Networks
 F8:D4:62       Pumatron               # Pumatronix Equipamentos Eletronicos Ltda.
@@ -19674,6 +19699,7 @@ F8:EA:0A        Dipl-Mat               # Dipl.-Math. Michael Rauch
 F8:F0:14       Rackware               # RackWare Inc.
 F8:F2:5A       G-Lab                  # G-Lab GmbH
 F8:F7:D3       Internat               # International Communications Corporation
+F8:F7:FF       Syn-Tech               # SYN-TECH SYSTEMS INC
 F8:FB:2F       Santur                 # Santur Corporation
 F8:FE:5C       Reciproc               # Reciprocal Labs Corp
 FC:00:12       ToshibaS               # Toshiba Samsung Storage Technolgoy Korea Corporation 
@@ -19684,6 +19710,7 @@ FC:0F:E6        SonyComp               # Sony Computer Entertainment Inc.
 FC:10:BD       ControlS               # Control Sistematizado S.A.
 FC:17:94       Intercre               # InterCreative Co., Ltd
 FC:1F:C0       Eurecam
+FC:25:3F       Apple                  # Apple, Inc.
 FC:2E:2D       LoromInd               # Lorom Industrial Co.LTD.
 FC:2F:40       Calxeda                # Calxeda, Inc.
 FC:35:98       Favite                 # Favite Inc.
index 0ef4dde2308927ea13dd241cd7f05fc3293d710e..a96380777c69bab404f80a7a84196ed9bc2d8d71 100644 (file)
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 # Service Name and Transport Protocol Port Number Registry
 # 
 # Last Updated
-# 2011-12-16
+# 2011-12-22
 # 
 # Note
 # 
@@ -60,8 +60,8 @@
 # 
 # This registry is also available in plain text.
 # 
-# Transport                                                                                                                                  Registration Modification                                    Service      Known
-# Service Name   Port Number Protocol          Description                          Assignee                                           Contact                              Date         Date                 Reference                Code    Unauthorized                       Assignment Notes
+# Transport                                                                                                                                  Registration Modification                                        Service      Known
+# Service Name   Port Number Protocol          Description                          Assignee                                           Contact                              Date         Date                   Reference                  Code    Unauthorized                       Assignment Notes
 # Uses
 # 0         tcp    Reserved                     [Jon_Postel]                              [Jon_Postel]
 # 0         udp    Reserved                     [Jon_Postel]                              [Jon_Postel]
@@ -84,7 +84,7 @@ echo  7/udp   # Echo                         [Jon_Postel]
 discard        9/tcp   # Discard                      [Jon_Postel]                              [Jon_Postel]
 discard        9/udp   # Discard                      [Jon_Postel]                              [Jon_Postel]
 discard        9/sctp  # Discard                      [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]
-discard        9/dccp  # Discard                      [Eddie_Kohler]                            [Eddie_Kohler]                                                                      [RFC4340]                         1145656131
+discard        9/dccp  # Discard                      [Eddie_Kohler]                            [Eddie_Kohler]                                                                      [RFC4340]                             1145656131
 # 10         tcp    Unassigned
 # 10         udp    Unassigned
 systat 11/tcp  # Active Users                 [Jon_Postel]                              [Jon_Postel]
@@ -110,16 +110,16 @@ chargen   19/udp  # Character Generator
 ftp-data       20/tcp  # File Transfer [Default Data] [Jon_Postel]                              [Jon_Postel]
 ftp-data       20/udp  # File Transfer [Default Data] [Jon_Postel]                              [Jon_Postel]
 ftp-data       20/sctp # FTP                          [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]
-ftp    21/tcp  # File Transfer [Control]      [Jon_Postel]                              [Jon_Postel]                                                                        [RFC959]                                                  Defined TXT keys: u=<username> p=<password> path=<path>
-ftp    21/udp  # File Transfer [Control]      [Jon_Postel]                              [Jon_Postel]                                                                        [RFC959]                                                  Defined TXT keys: u=<username> p=<password> path=<path>
-ftp    21/sctp # FTP                          [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]                                                 Defined TXT keys: u=<username> p=<password> path=<path>
-ssh    22/tcp  # The Secure Shell (SSH)                                                                                                                                     [RFC4251]                                                 Defined TXT keys: u=<username> p=<password>
+ftp    21/tcp  # File Transfer [Control]      [Jon_Postel]                              [Jon_Postel]                                                                        [RFC959]                                                      Defined TXT keys: u=<username> p=<password> path=<path>
+ftp    21/udp  # File Transfer [Control]      [Jon_Postel]                              [Jon_Postel]                                                                        [RFC959]                                                      Defined TXT keys: u=<username> p=<password> path=<path>
+ftp    21/sctp # FTP                          [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]                                                     Defined TXT keys: u=<username> p=<password> path=<path>
+ssh    22/tcp  # The Secure Shell (SSH)                                                                                                                                     [RFC4251]                                                     Defined TXT keys: u=<username> p=<password>
 # Protocol
-ssh    22/udp  # The Secure Shell (SSH)                                                                                                                                     [RFC4251]                                                 Defined TXT keys: u=<username> p=<password>
+ssh    22/udp  # The Secure Shell (SSH)                                                                                                                                     [RFC4251]                                                     Defined TXT keys: u=<username> p=<password>
 # Protocol
-ssh    22/sctp # SSH                          [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]                                                 Defined TXT keys: u=<username> p=<password>
-telnet 23/tcp  # Telnet                       [Jon_Postel]                              [Jon_Postel]                                                                        [RFC854]                                                  Defined TXT keys: u=<username> p=<password>
-telnet 23/udp  # Telnet                       [Jon_Postel]                              [Jon_Postel]                                                                        [RFC854]                                                  Defined TXT keys: u=<username> p=<password>
+ssh    22/sctp # SSH                          [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]                                                     Defined TXT keys: u=<username> p=<password>
+telnet 23/tcp  # Telnet                       [Jon_Postel]                              [Jon_Postel]                                                                        [RFC854]                                                      Defined TXT keys: u=<username> p=<password>
+telnet 23/udp  # Telnet                       [Jon_Postel]                              [Jon_Postel]                                                                        [RFC854]                                                      Defined TXT keys: u=<username> p=<password>
 # 24         tcp    any private mail system      [Rick_Adams]                              [Rick_Adams]
 # 24         udp    any private mail system      [Rick_Adams]                              [Rick_Adams]
 smtp   25/tcp  # Simple Mail Transfer         [Jon_Postel]                              [Jon_Postel]
@@ -212,7 +212,7 @@ whoispp     63/tcp  # IANA assigned this           [Rickard_Schoultz]
 # well-formed service name as
 # a replacement for "whois++".
 # This entry is an alias to "whoispp". This entry is now
-whois++        63/tcp  # whois++                      [Rickard_Schoultz]                        [Rickard_Schoultz]                                                                                                                            historic, not usable for use with many common service
+whois++        63/tcp  # whois++                      [Rickard_Schoultz]                        [Rickard_Schoultz]                                                                                                                                historic, not usable for use with many common service
 # discovery mechanisms.
 # whois++
 # 
@@ -220,7 +220,7 @@ whoispp     63/udp  # IANA assigned this           [Rickard_Schoultz]
 # well-formed service name as
 # a replacement for "whois++".
 # This entry is an alias to "whoispp". This entry is now
-whois++        63/udp  # whois++                      [Rickard_Schoultz]                        [Rickard_Schoultz]                                                                                                                            historic, not usable for use with many common service
+whois++        63/udp  # whois++                      [Rickard_Schoultz]                        [Rickard_Schoultz]                                                                                                                                historic, not usable for use with many common service
 # discovery mechanisms.
 covia  64/tcp  # Communications Integrator    [Dan_Smith]                               [Dan_Smith]
 # (CI)
@@ -234,7 +234,7 @@ sql-net     66/tcp  # IANA assigned this           [Jack_Haverty]
 # well-formed service name as
 # a replacement for "sql*net".
 # This entry is an alias to "sql-net". This entry is now
-sql*net        66/tcp  # Oracle SQL*NET               [Jack_Haverty]                            [Jack_Haverty]                                                                                                                                historic, not usable for use with many common service
+sql*net        66/tcp  # Oracle SQL*NET               [Jack_Haverty]                            [Jack_Haverty]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 # Oracle SQL*NET
 # 
@@ -242,9 +242,9 @@ sql-net     66/udp  # IANA assigned this           [Jack_Haverty]
 # well-formed service name as
 # a replacement for "sql*net".
 # This entry is an alias to "sql-net". This entry is now
-sql*net        66/udp  # Oracle SQL*NET               [Jack_Haverty]                            [Jack_Haverty]                                                                                                                                historic, not usable for use with many common service
+sql*net        66/udp  # Oracle SQL*NET               [Jack_Haverty]                            [Jack_Haverty]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
-bootps 67/tcp  # Bootstrap Protocol Server    [Bill_Croft]                              [Bill_Croft]                                                                        [RFC951]                                                  Defined TXT keys: None
+bootps 67/tcp  # Bootstrap Protocol Server    [Bill_Croft]                              [Bill_Croft]                                                                        [RFC951]                                                      Defined TXT keys: None
 bootps 67/udp  # Bootstrap Protocol Server
 bootpc 68/tcp  # Bootstrap Protocol Client    [Bill_Croft]                              [Bill_Croft]
 bootpc 68/udp  # Bootstrap Protocol Client    [Bill_Croft]                              [Bill_Croft]
@@ -272,23 +272,23 @@ vettcp    78/tcp  # vettcp                       [Christopher_Leong]
 vettcp 78/udp  # vettcp                       [Christopher_Leong]                       [Christopher_Leong]
 # Unauthorized
 # use by some
-finger 79/tcp  # Finger                       [David_Zimmerman]                         [David_Zimmerman]                                                                                                                mail users
+finger 79/tcp  # Finger                       [David_Zimmerman]                         [David_Zimmerman]                                                                                                                    mail users
 # (see
 # [RFC4146]
 # for details)
 # Unauthorized
 # use by some
-finger 79/udp  # Finger                       [David_Zimmerman]                         [David_Zimmerman]                                                                                                                mail users
+finger 79/udp  # Finger                       [David_Zimmerman]                         [David_Zimmerman]                                                                                                                    mail users
 # (see
 # [RFC4146]
 # for details)
-http   80/tcp  # World Wide Web HTTP                                                                                                                                                                                                  Defined TXT keys: u=<username> p=<password> path=<path to
+http   80/tcp  # World Wide Web HTTP                                                                                                                                                                                                      Defined TXT keys: u=<username> p=<password> path=<path to
 # document>
-http   80/udp  # World Wide Web HTTP                                                                                                                                                                                                  Defined TXT keys: u=<username> p=<password> path=<path to
+http   80/udp  # World Wide Web HTTP                                                                                                                                                                                                      Defined TXT keys: u=<username> p=<password> path=<path to
 # document>
-www    80/tcp  # World Wide Web HTTP                                                                                                                                                                                                  This is a duplicate of the "http" service and should not be
+www    80/tcp  # World Wide Web HTTP                                                                                                                                                                                                      This is a duplicate of the "http" service and should not be
 # used for discovery purposes.
-www    80/udp  # World Wide Web HTTP                                                                                                                                                                                                  This is a duplicate of the "http" service and should not be
+www    80/udp  # World Wide Web HTTP                                                                                                                                                                                                      This is a duplicate of the "http" service and should not be
 # used for discovery purposes.
 # This is a duplicate of the "http" service and should not be
 # used for discovery purposes. u=<username> p=<password>
@@ -301,7 +301,7 @@ www 80/udp  # World Wide Web HTTP
 # "typical" web browser client software, and * is intented
 # primarily to be viewed by a human user. Of course, the
 # definition of "typical web browser" is subjective, and may
-www-http       80/tcp  # World Wide Web HTTP          [Tim_Berners_Lee]                         [Tim_Berners_Lee]                                                                                                                             change over time, but for practical purposes the DNS-SD
+www-http       80/tcp  # World Wide Web HTTP          [Tim_Berners_Lee]                         [Tim_Berners_Lee]                                                                                                                                 change over time, but for practical purposes the DNS-SD
 # service type "http" can be understood as meaning
 # "human-readable HTML content served over HTTP". In some cases
 # other widely-supported content types may also be appropriate,
@@ -325,7 +325,7 @@ www-http    80/tcp  # World Wide Web HTTP          [Tim_Berners_Lee]
 # "typical" web browser client software, and * is intented
 # primarily to be viewed by a human user. Of course, the
 # definition of "typical web browser" is subjective, and may
-www-http       80/udp  # World Wide Web HTTP          [Tim_Berners_Lee]                         [Tim_Berners_Lee]                                                                                                                             change over time, but for practical purposes the DNS-SD
+www-http       80/udp  # World Wide Web HTTP          [Tim_Berners_Lee]                         [Tim_Berners_Lee]                                                                                                                                 change over time, but for practical purposes the DNS-SD
 # service type "http" can be understood as meaning
 # "human-readable HTML content served over HTTP". In some cases
 # other widely-supported content types may also be appropriate,
@@ -338,7 +338,7 @@ www-http    80/udp  # World Wide Web HTTP          [Tim_Berners_Lee]
 # DNS-SD service type, for example, XUL (XML User Interface
 # Language) transported over HTTP is advertised explicitly as
 # DNS-SD service type "xul-http".
-http   80/sctp # HTTP                         [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]                                                 Defined TXT keys: u=<username> p=<password> path=<path to
+http   80/sctp # HTTP                         [Randall_Stewart]                         [Randall_Stewart]                                                                   [RFC4960]                                                     Defined TXT keys: u=<username> p=<password> path=<path to
 # document>
 # 81                Unassigned                                                                                                                                    2007-09-06
 xfer   82/tcp  # XFER Utility                 [Thomas_M_Smith]                          [Thomas_M_Smith]
@@ -358,12 +358,12 @@ kerberos  88/udp  # Kerberos                     [B_Clifford_Neuman]
 su-mit-tg      89/tcp  # SU/MIT Telnet Gateway        [Mark_Crispin]                            [Mark_Crispin]
 su-mit-tg      89/udp  # SU/MIT Telnet Gateway        [Mark_Crispin]                            [Mark_Crispin]
 # PORT 90 also
-dnsix  90/tcp  # DNSIX Securit Attribute      [Charles_Watt]                            [Charles_Watt]                                                                                                                   being used
-# Token Map                                                                                                                                                                                               unofficially
+dnsix  90/tcp  # DNSIX Securit Attribute      [Charles_Watt]                            [Charles_Watt]                                                                                                                       being used
+# Token Map                                                                                                                                                                                                   unofficially
 # by Pointcast
 # PORT 90 also
-dnsix  90/udp  # DNSIX Securit Attribute      [Charles_Watt]                            [Charles_Watt]                                                                                                                   being used
-# Token Map                                                                                                                                                                                               unofficially
+dnsix  90/udp  # DNSIX Securit Attribute      [Charles_Watt]                            [Charles_Watt]                                                                                                                       being used
+# Token Map                                                                                                                                                                                                   unofficially
 # by Pointcast
 mit-dov        91/tcp  # MIT Dover Spooler            [Eliot_Moss]                              [Eliot_Moss]
 mit-dov        91/udp  # MIT Dover Spooler            [Eliot_Moss]                              [Eliot_Moss]
@@ -404,13 +404,13 @@ csnet-ns  105/tcp # Mailbox Name Nameserver      [Marvin_Solomon]
 csnet-ns       105/udp # Mailbox Name Nameserver      [Marvin_Solomon]                          [Marvin_Solomon]
 # 106
 # Unauthorized
-3com-tsmux     106/tcp # 3COM-TSMUX                   [Jeremy_Siegel]                           [Jeremy_Siegel]                                                                                                                  use by
+3com-tsmux     106/tcp # 3COM-TSMUX                   [Jeremy_Siegel]                           [Jeremy_Siegel]                                                                                                                      use by
 # insecure
 # poppassd
 # protocol
 # 106
 # Unauthorized
-3com-tsmux     106/udp # 3COM-TSMUX                   [Jeremy_Siegel]                           [Jeremy_Siegel]                                                                                                                  use by
+3com-tsmux     106/udp # 3COM-TSMUX                   [Jeremy_Siegel]                           [Jeremy_Siegel]                                                                                                                      use by
 # insecure
 # poppassd
 # protocol
@@ -435,7 +435,7 @@ mcidas      112/udp # McIDAS Data Transmission     [Glenn_Davis]
 # ident               113        tcp
 auth   113/tcp # Authentication Service       [Mike_St_Johns]                           [Mike_St_Johns]
 auth   113/udp # Authentication Service       [Mike_St_Johns]                           [Mike_St_Johns]
-# 114               unassigned                                                                                                                                                                                                           Deprecated June 2004
+# 114               unassigned                                                                                                                                                                                                               Deprecated June 2004
 sftp   115/tcp # Simple File Transfer         [Mark_Lottor]                             [Mark_Lottor]
 # Protocol
 sftp   115/udp # Simple File Transfer         [Mark_Lottor]                             [Mark_Lottor]
@@ -467,11 +467,11 @@ locus-map 125/tcp # Locus PC-Interface Net Map   [Eric_Peterson]
 locus-map      125/udp # Locus PC-Interface Net Map   [Eric_Peterson]                           [Eric_Peterson]
 # Ser
 # Port 126 Previously assigned to application below unitary
-nxedit 126/tcp # NXEdit                       [Don_Payette]                             [Don_Payette]                                                                                                                                 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary
+nxedit 126/tcp # NXEdit                       [Don_Payette]                             [Don_Payette]                                                                                                                                     126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary
 # Login <feil&kronos.nisd.cam.unisys.com> Port 126 Previously
 # assigned to application above
 # Port 126 Previously assigned to application below unitary
-nxedit 126/udp # NXEdit                       [Don_Payette]                             [Don_Payette]                                                                                                                                 126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary
+nxedit 126/udp # NXEdit                       [Don_Payette]                             [Don_Payette]                                                                                                                                     126/tcp Unisys Unitary Login unitary 126/udp Unisys Unitary
 # Login <feil&kronos.nisd.cam.unisys.com> Port 126 Previously
 # assigned to application above
 locus-con      127/tcp # Locus PC-Interface Conn      [Eric_Peterson]                           [Eric_Peterson]
@@ -582,7 +582,7 @@ cl-1        172/tcp # IANA assigned this           [Kevin_DeVault]
 # well-formed service name as
 # a replacement for "cl/1".
 # This entry is an alias to "cl-1". This entry is now historic,
-cl/1   172/tcp # Network Innovations CL/1     [Kevin_DeVault]                           [Kevin_DeVault]                                                                                                                               not usable for use with many common service discovery
+cl/1   172/tcp # Network Innovations CL/1     [Kevin_DeVault]                           [Kevin_DeVault]                                                                                                                                   not usable for use with many common service discovery
 # mechanisms.
 # Network Innovations CL/1
 # 
@@ -590,7 +590,7 @@ cl-1        172/udp # IANA assigned this           [Kevin_DeVault]
 # well-formed service name as
 # a replacement for "cl/1".
 # This entry is an alias to "cl-1". This entry is now historic,
-cl/1   172/udp # Network Innovations CL/1     [Kevin_DeVault]                           [Kevin_DeVault]                                                                                                                               not usable for use with many common service discovery
+cl/1   172/udp # Network Innovations CL/1     [Kevin_DeVault]                           [Kevin_DeVault]                                                                                                                                   not usable for use with many common service discovery
 # mechanisms.
 xyplex-mux     173/tcp # Xyplex                       [Bob_Stewart]                             [Bob_Stewart]
 xyplex-mux     173/udp # Xyplex                       [Bob_Stewart]                             [Bob_Stewart]
@@ -695,7 +695,7 @@ z39-50      210/tcp # IANA assigned this           [Mark_H_Needleman]
 # well-formed service name as
 # a replacement for "z39.50".
 # This entry is an alias to "z39-50". This entry is now
-z39.50 210/tcp # ANSI Z39.50                  [Mark_H_Needleman]                        [Mark_H_Needleman]                                                                                                                            historic, not usable for use with many common service
+z39.50 210/tcp # ANSI Z39.50                  [Mark_H_Needleman]                        [Mark_H_Needleman]                                                                                                                                historic, not usable for use with many common service
 # discovery mechanisms.
 # ANSI Z39.50
 # 
@@ -703,7 +703,7 @@ z39-50      210/udp # IANA assigned this           [Mark_H_Needleman]
 # well-formed service name as
 # a replacement for "z39.50".
 # This entry is an alias to "z39-50". This entry is now
-z39.50 210/udp # ANSI Z39.50                  [Mark_H_Needleman]                        [Mark_H_Needleman]                                                                                                                            historic, not usable for use with many common service
+z39.50 210/udp # ANSI Z39.50                  [Mark_H_Needleman]                        [Mark_H_Needleman]                                                                                                                                historic, not usable for use with many common service
 # discovery mechanisms.
 # Texas Instruments 914C/G
 # Terminal
@@ -711,8 +711,8 @@ z39.50      210/udp # ANSI Z39.50                  [Mark_H_Needleman]
 # IANA assigned this
 # well-formed service name as
 # a replacement for "914c/g".
-# Texas Instruments 914C/G                                                                                                                                                                                             This entry is an alias to "914c-g". This entry is now
-914c/g 211/tcp # Terminal                     [Bill_Harrell]                            [Bill_Harrell]                                                                                                                                historic, not usable for use with many common service
+# Texas Instruments 914C/G                                                                                                                                                                                                 This entry is an alias to "914c-g". This entry is now
+914c/g 211/tcp # Terminal                     [Bill_Harrell]                            [Bill_Harrell]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 # Texas Instruments 914C/G
 # Terminal
@@ -720,8 +720,8 @@ z39.50      210/udp # ANSI Z39.50                  [Mark_H_Needleman]
 # IANA assigned this
 # well-formed service name as
 # a replacement for "914c/g".
-# Texas Instruments 914C/G                                                                                                                                                                                             This entry is an alias to "914c-g". This entry is now
-914c/g 211/udp # Terminal                     [Bill_Harrell]                            [Bill_Harrell]                                                                                                                                historic, not usable for use with many common service
+# Texas Instruments 914C/G                                                                                                                                                                                                 This entry is an alias to "914c-g". This entry is now
+914c/g 211/udp # Terminal                     [Bill_Harrell]                            [Bill_Harrell]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 anet   212/tcp # ATEXSSTR                     [Jim_Taylor]                              [Jim_Taylor]
 anet   212/udp # ATEXSSTR                     [Jim_Taylor]                              [Jim_Taylor]
@@ -757,8 +757,8 @@ cdc 223/tcp # Certificate Distribution     [Kannan_Alagappan]
 # Center
 cdc    223/udp # Certificate Distribution     [Kannan_Alagappan]                        [Kannan_Alagappan]
 # Center
-masqdialer     224/tcp # masqdialer                   [Charles_Wright]                          [Charles_Wright]                                                                                                                              Possible Conflict of Port 222 with "Masqdialer"
-masqdialer     224/udp # masqdialer                   [Charles_Wright]                          [Charles_Wright]                                                                                                                              Possible Conflict of Port 222 with "Masqdialer"
+masqdialer     224/tcp # masqdialer                   [Charles_Wright]                          [Charles_Wright]                                                                                                                                  Possible Conflict of Port 222 with "Masqdialer"
+masqdialer     224/udp # masqdialer                   [Charles_Wright]                          [Charles_Wright]                                                                                                                                  Possible Conflict of Port 222 with "Masqdialer"
 # 225-241             Reserved                     [Jon_Postel]                              [Jon_Postel]
 direct 242/tcp # Direct                       [Herb_Sutter]                             [Herb_Sutter]
 direct 242/udp # Direct                       [Herb_Sutter]                             [Herb_Sutter]
@@ -777,7 +777,7 @@ subntbcst-tftp      247/tcp # IANA assigned this           [John_Fake]
 # a replacement for
 # "subntbcst_tftp".
 # This entry is an alias to "subntbcst-tftp". This entry is now
-subntbcst_tftp 247/tcp # SUBNTBCST_TFTP               [John_Fake]                               [John_Fake]                                                                                                                                   historic, not usable for use with many common service
+subntbcst_tftp 247/tcp # SUBNTBCST_TFTP               [John_Fake]                               [John_Fake]                                                                                                                                       historic, not usable for use with many common service
 # discovery mechanisms.
 # SUBNTBCST_TFTP
 # 
@@ -786,7 +786,7 @@ subntbcst-tftp      247/udp # IANA assigned this           [John_Fake]
 # a replacement for
 # "subntbcst_tftp".
 # This entry is an alias to "subntbcst-tftp". This entry is now
-subntbcst_tftp 247/udp # SUBNTBCST_TFTP               [John_Fake]                               [John_Fake]                                                                                                                                   historic, not usable for use with many common service
+subntbcst_tftp 247/udp # SUBNTBCST_TFTP               [John_Fake]                               [John_Fake]                                                                                                                                       historic, not usable for use with many common service
 # discovery mechanisms.
 bhfhs  248/tcp # bhfhs                        [John_Kelly]                              [John_Kelly]
 bhfhs  248/udp # bhfhs                        [John_Kelly]                              [John_Kelly]
@@ -898,15 +898,15 @@ matip-type-a      350/tcp # MATIP Type A                 [Alain_Robert]
 matip-type-a   350/udp # MATIP Type A                 [Alain_Robert]                            [Alain_Robert]                                                                      [RFC2351]
 matip-type-b   351/tcp # MATIP Type B                 [Alain_Robert]                            [Alain_Robert]                                                                      [RFC2351]
 matip-type-b   351/udp # MATIP Type B                 [Alain_Robert]                            [Alain_Robert]                                                                      [RFC2351]
-bhoetty        351/tcp # bhoetty                      [John_Kelly]                              [John_Kelly]                                                                                                                                  This entry records an unassigned but widespread use (added
+bhoetty        351/tcp # bhoetty                      [John_Kelly]                              [John_Kelly]                                                                                                                                      This entry records an unassigned but widespread use (added
 # 5/21/97)
-bhoetty        351/udp # bhoetty                      [John_Kelly]                              [John_Kelly]                                                                                                                                  This entry records an unassigned but widespread use (added
+bhoetty        351/udp # bhoetty                      [John_Kelly]                              [John_Kelly]                                                                                                                                      This entry records an unassigned but widespread use (added
 # 5/21/97)
-dtag-ste-sb    352/tcp # DTAG                         [Ruediger_Wald]                           [Ruediger_Wald]                                                                                                                               (assigned long ago)
-dtag-ste-sb    352/udp # DTAG                         [Ruediger_Wald]                           [Ruediger_Wald]                                                                                                                               (assigned long ago)
-bhoedap4       352/tcp # bhoedap4                     [John_Kelly]                              [John_Kelly]                                                                                                                                  This entry records an unassigned but widespread use (added
+dtag-ste-sb    352/tcp # DTAG                         [Ruediger_Wald]                           [Ruediger_Wald]                                                                                                                                   (assigned long ago)
+dtag-ste-sb    352/udp # DTAG                         [Ruediger_Wald]                           [Ruediger_Wald]                                                                                                                                   (assigned long ago)
+bhoedap4       352/tcp # bhoedap4                     [John_Kelly]                              [John_Kelly]                                                                                                                                      This entry records an unassigned but widespread use (added
 # 5/21/97)
-bhoedap4       352/udp # bhoedap4                     [John_Kelly]                              [John_Kelly]                                                                                                                                  This entry records an unassigned but widespread use (added
+bhoedap4       352/udp # bhoedap4                     [John_Kelly]                              [John_Kelly]                                                                                                                                      This entry records an unassigned but widespread use (added
 # 5/21/97)
 ndsauth        353/tcp # NDSAUTH                      [Jayakumar_Ramalingam]                    [Jayakumar_Ramalingam]
 ndsauth        353/udp # NDSAUTH                      [Jayakumar_Ramalingam]                    [Jayakumar_Ramalingam]
@@ -937,7 +937,7 @@ rsvp-tunnel 363/tcp # IANA assigned this           [Andreas_Terzis]
 # a replacement for
 # "rsvp_tunnel".
 # This entry is an alias to "rsvp-tunnel". This entry is now
-rsvp_tunnel    363/tcp # RSVP Tunnel                  [Andreas_Terzis]                          [Andreas_Terzis]                                                                                                                              historic, not usable for use with many common service
+rsvp_tunnel    363/tcp # RSVP Tunnel                  [Andreas_Terzis]                          [Andreas_Terzis]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # RSVP Tunnel
 # 
@@ -946,7 +946,7 @@ rsvp-tunnel 363/udp # IANA assigned this           [Andreas_Terzis]
 # a replacement for
 # "rsvp_tunnel".
 # This entry is an alias to "rsvp-tunnel". This entry is now
-rsvp_tunnel    363/udp # RSVP Tunnel                  [Andreas_Terzis]                          [Andreas_Terzis]                                                                                                                              historic, not usable for use with many common service
+rsvp_tunnel    363/udp # RSVP Tunnel                  [Andreas_Terzis]                          [Andreas_Terzis]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 aurora-cmgr    364/tcp # Aurora CMGR                  [Philip_Budne]                            [Philip_Budne]
 aurora-cmgr    364/udp # Aurora CMGR                  [Philip_Budne]                            [Philip_Budne]
@@ -1038,8 +1038,8 @@ iso-tsap-c2       399/tcp # ISO Transport Class 2        [Yanick_Pouffary]
 # Non-Control over TCP
 iso-tsap-c2    399/udp # ISO Transport Class 2        [Yanick_Pouffary]                         [Yanick_Pouffary]
 # Non-Control over UDP
-osb-sd 400/tcp # Oracle Secure Backup         [Joseph_Dziedzic]                         [Joseph_Dziedzic]                                         2008-06-06                                                                          Formerly was Workstation Solutions
-osb-sd 400/udp # Oracle Secure Backup         [Joseph_Dziedzic]                         [Joseph_Dziedzic]                                         2008-06-06                                                                          Formerly was Workstation Solutions
+osb-sd 400/tcp # Oracle Secure Backup         [Joseph_Dziedzic]                         [Joseph_Dziedzic]                                         2008-06-06                                                                              Formerly was Workstation Solutions
+osb-sd 400/udp # Oracle Secure Backup         [Joseph_Dziedzic]                         [Joseph_Dziedzic]                                         2008-06-06                                                                              Formerly was Workstation Solutions
 ups    401/tcp # Uninterruptible Power Supply [Charles_Bennett]                         [Charles_Bennett]                                         2008-08-29
 ups    401/udp # Uninterruptible Power Supply [Charles_Bennett]                         [Charles_Bennett]                                         2008-08-29
 genie  402/tcp # Genie Protocol               [Mark_Hankin]                             [Mark_Hankin]
@@ -1114,7 +1114,7 @@ ocs-cmu   428/tcp # IANA assigned this
 # well-formed service name as
 # a replacement for "ocs_cmu".
 # This entry is an alias to "ocs-cmu". This entry is now
-ocs_cmu        428/tcp # OCS_CMU                                                                                                                                                                                                              historic, not usable for use with many common service
+ocs_cmu        428/tcp # OCS_CMU                                                                                                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # OCS_CMU
 # 
@@ -1122,7 +1122,7 @@ ocs-cmu   428/udp # IANA assigned this
 # well-formed service name as
 # a replacement for "ocs_cmu".
 # This entry is an alias to "ocs-cmu". This entry is now
-ocs_cmu        428/udp # OCS_CMU                                                                                                                                                                                                              historic, not usable for use with many common service
+ocs_cmu        428/udp # OCS_CMU                                                                                                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # OCS_AMU
 # 
@@ -1130,7 +1130,7 @@ ocs-amu   429/tcp # IANA assigned this           [Florence_Wyman]
 # well-formed service name as
 # a replacement for "ocs_amu".
 # This entry is an alias to "ocs-amu". This entry is now
-ocs_amu        429/tcp # OCS_AMU                      [Florence_Wyman]                          [Florence_Wyman]                                                                                                                              historic, not usable for use with many common service
+ocs_amu        429/tcp # OCS_AMU                      [Florence_Wyman]                          [Florence_Wyman]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # OCS_AMU
 # 
@@ -1138,7 +1138,7 @@ ocs-amu   429/udp # IANA assigned this           [Florence_Wyman]
 # well-formed service name as
 # a replacement for "ocs_amu".
 # This entry is an alias to "ocs-amu". This entry is now
-ocs_amu        429/udp # OCS_AMU                      [Florence_Wyman]                          [Florence_Wyman]                                                                                                                              historic, not usable for use with many common service
+ocs_amu        429/udp # OCS_AMU                      [Florence_Wyman]                          [Florence_Wyman]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 utmpsd 430/tcp # UTMPSD
 utmpsd 430/udp # UTMPSD
@@ -1171,7 +1171,7 @@ cvc-hostd 442/tcp # IANA assigned this           [Bill_Davidson]
 # a replacement for
 # "cvc_hostd".
 # This entry is an alias to "cvc-hostd". This entry is now
-cvc_hostd      442/tcp # cvc_hostd                    [Bill_Davidson]                           [Bill_Davidson]                                                                                                                               historic, not usable for use with many common service
+cvc_hostd      442/tcp # cvc_hostd                    [Bill_Davidson]                           [Bill_Davidson]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # cvc_hostd
 # 
@@ -1180,7 +1180,7 @@ cvc-hostd 442/udp # IANA assigned this           [Bill_Davidson]
 # a replacement for
 # "cvc_hostd".
 # This entry is an alias to "cvc-hostd". This entry is now
-cvc_hostd      442/udp # cvc_hostd                    [Bill_Davidson]                           [Bill_Davidson]                                                                                                                               historic, not usable for use with many common service
+cvc_hostd      442/udp # cvc_hostd                    [Bill_Davidson]                           [Bill_Davidson]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 https  443/tcp # http protocol over TLS/SSL   [Kipp_E_B_Hickman]                        [Kipp_E_B_Hickman]
 https  443/udp # http protocol over TLS/SSL   [Kipp_E_B_Hickman]                        [Kipp_E_B_Hickman]
@@ -1454,8 +1454,8 @@ dhcpv6-client     546/tcp # DHCPv6 Client
 dhcpv6-client  546/udp # DHCPv6 Client
 dhcpv6-server  547/tcp # DHCPv6 Server                [Jim_Bound]                               [Jim_Bound]
 dhcpv6-server  547/udp # DHCPv6 Server                [Jim_Bound]                               [Jim_Bound]
-afpovertcp     548/tcp # AFP over TCP                 [Leland_Wallace]                          [Leland_Wallace]                                                                                                                              Defined TXT keys: u=<username> p=<password> path=<path>
-afpovertcp     548/udp # AFP over TCP                 [Leland_Wallace]                          [Leland_Wallace]                                                                                                                              Defined TXT keys: u=<username> p=<password> path=<path>
+afpovertcp     548/tcp # AFP over TCP                 [Leland_Wallace]                          [Leland_Wallace]                                                                                                                                  Defined TXT keys: u=<username> p=<password> path=<path>
+afpovertcp     548/udp # AFP over TCP                 [Leland_Wallace]                          [Leland_Wallace]                                                                                                                                  Defined TXT keys: u=<username> p=<password> path=<path>
 idfp   549/tcp # IDFP                         [Ramana_Kovi]                             [Ramana_Kovi]
 idfp   549/udp # IDFP                         [Ramana_Kovi]                             [Ramana_Kovi]
 new-rwho       550/tcp # new-who                                                                                                                                                    [n/a]
@@ -1532,7 +1532,7 @@ philips-vc        583/tcp # Philips Video-Conferencing   [Janna_Chang]
 philips-vc     583/udp # Philips Video-Conferencing   [Janna_Chang]                             [Janna_Chang]
 keyserver      584/tcp # Key Server                   [Gary_Howland]                            [Gary_Howland]
 keyserver      584/udp # Key Server                   [Gary_Howland]                            [Gary_Howland]
-# 585               De-registered                                                                                                                                 2006-04-25                                                             Use of 585 is not recommended, use 993 instead
+# 585               De-registered                                                                                                                                 2006-04-25                                                                 Use of 585 is not recommended, use 993 instead
 password-chg   586/tcp # Password Change
 password-chg   586/udp # Password Change
 submission     587/tcp # Message Submission                                                                                                                            2011-11-17   [RFC6409]
@@ -1631,7 +1631,7 @@ dec-dlm   625/tcp # IANA assigned this           [Rudi_Martin_2]
 # well-formed service name as
 # a replacement for "dec_dlm".
 # This entry is an alias to "dec-dlm". This entry is now
-dec_dlm        625/tcp # DEC DLM                      [Rudi_Martin_2]                           [Rudi_Martin_2]                                                                                                                               historic, not usable for use with many common service
+dec_dlm        625/tcp # DEC DLM                      [Rudi_Martin_2]                           [Rudi_Martin_2]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # DEC DLM
 # 
@@ -1639,7 +1639,7 @@ dec-dlm   625/udp # IANA assigned this           [Rudi_Martin_2]
 # well-formed service name as
 # a replacement for "dec_dlm".
 # This entry is an alias to "dec-dlm". This entry is now
-dec_dlm        625/udp # DEC DLM                      [Rudi_Martin_2]                           [Rudi_Martin_2]                                                                                                                               historic, not usable for use with many common service
+dec_dlm        625/udp # DEC DLM                      [Rudi_Martin_2]                           [Rudi_Martin_2]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 asia   626/tcp # ASIA                         [Michael_Dasenbrock]                      [Michael_Dasenbrock]
 asia   626/udp # ASIA                         [Michael_Dasenbrock]                      [Michael_Dasenbrock]
@@ -1651,9 +1651,9 @@ qmqp      628/udp # QMQP                         [Dan_Bernstein_2]
 3com-amp3      629/udp # 3Com AMP3                    [Prakash_Banthia]                         [Prakash_Banthia]
 rda    630/tcp # RDA                          [John_Hadjioannou]                        [John_Hadjioannou]
 rda    630/udp # RDA                          [John_Hadjioannou]                        [John_Hadjioannou]
-ipp    631/tcp # IPP (Internet Printing       [Carl_Uno_Manros]                         [Carl_Uno_Manros]                                                                                                                             Defined TXT keys: See BonjourPrinting.pdf.
+ipp    631/tcp # IPP (Internet Printing       [Carl_Uno_Manros]                         [Carl_Uno_Manros]                                                                                                                                 Defined TXT keys: See BonjourPrinting.pdf.
 # Protocol)
-ipp    631/udp # IPP (Internet Printing       [Carl_Uno_Manros]                         [Carl_Uno_Manros]                                                                                                                             Defined TXT keys: See BonjourPrinting.pdf.
+ipp    631/udp # IPP (Internet Printing       [Carl_Uno_Manros]                         [Carl_Uno_Manros]                                                                                                                                 Defined TXT keys: See BonjourPrinting.pdf.
 # Protocol)
 bmpp   632/tcp # bmpp                         [Troy_Rollo]                              [Troy_Rollo]
 bmpp   632/udp # bmpp                         [Troy_Rollo]                              [Troy_Rollo]
@@ -2011,7 +2011,7 @@ iclcnet-svinfo    887/tcp # IANA assigned this           [Bob_Lyon]
 # a replacement for
 # "iclcnet_svinfo".
 # This entry is an alias to "iclcnet-svinfo". This entry is now
-iclcnet_svinfo 887/tcp # ICL coNETion server info     [Bob_Lyon]                                [Bob_Lyon]                                                                                                                                    historic, not usable for use with many common service
+iclcnet_svinfo 887/tcp # ICL coNETion server info     [Bob_Lyon]                                [Bob_Lyon]                                                                                                                                        historic, not usable for use with many common service
 # discovery mechanisms.
 # ICL coNETion server info
 # 
@@ -2020,11 +2020,11 @@ iclcnet-svinfo  887/udp # IANA assigned this           [Bob_Lyon]
 # a replacement for
 # "iclcnet_svinfo".
 # This entry is an alias to "iclcnet-svinfo". This entry is now
-iclcnet_svinfo 887/udp # ICL coNETion server info     [Bob_Lyon]                                [Bob_Lyon]                                                                                                                                    historic, not usable for use with many common service
+iclcnet_svinfo 887/udp # ICL coNETion server info     [Bob_Lyon]                                [Bob_Lyon]                                                                                                                                        historic, not usable for use with many common service
 # discovery mechanisms.
 accessbuilder  888/tcp # AccessBuilder                [Steve_Sweeney]                           [Steve_Sweeney]
 accessbuilder  888/udp # AccessBuilder                [Steve_Sweeney]                           [Steve_Sweeney]
-cddbp  888/tcp # CD Database Protocol         [Steve_Scherf]                            [Steve_Scherf]                                                                                                                                This entry records an unassigned but widespread use
+cddbp  888/tcp # CD Database Protocol         [Steve_Scherf]                            [Steve_Scherf]                                                                                                                                    This entry records an unassigned but widespread use
 # 889-899             Unassigned
 omginitialrefs 900/tcp # OMG Initial Refs             [Christian_Callsen]                       [Christian_Callsen]
 omginitialrefs 900/udp # OMG Initial Refs             [Christian_Callsen]                       [Christian_Callsen]
@@ -2065,7 +2065,7 @@ telnets   992/tcp # telnet protocol over TLS/SSL
 telnets        992/udp # telnet protocol over TLS/SSL
 imaps  993/tcp # imap4 protocol over TLS/SSL
 imaps  993/udp # imap4 protocol over TLS/SSL
-# 994        tcp    Reserved                                                                                                                                      2011-08-31                                                             (previous contact was[Christopher_Allen])
+# 994        tcp    Reserved                                                                                                                                      2011-08-31                                                                 (previous contact was[Christopher_Allen])
 # 994        udp    Reserved
 pop3s  995/tcp # pop3 protocol over TLS/SSL   [Gordon_Mangione]                         [Gordon_Mangione]
 # (was spop3)
@@ -2200,8 +2200,8 @@ instl-boots       1067/tcp        # IANA assigned this
 # well-formed service name as
 # a replacement for
 # "instl_boots".
-# Installation Bootstrap                                                                                                                                                                                               This entry is an alias to "instl-boots". This entry is now
-instl_boots    1067/tcp        # Proto. Serv.                                                                                                                                                                                                         historic, not usable for use with many common service
+# Installation Bootstrap                                                                                                                                                                                                   This entry is an alias to "instl-boots". This entry is now
+instl_boots    1067/tcp        # Proto. Serv.                                                                                                                                                                                                             historic, not usable for use with many common service
 # discovery mechanisms.
 # Installation Bootstrap
 # Proto. Serv.
@@ -2210,8 +2210,8 @@ instl-boots       1067/udp        # IANA assigned this
 # well-formed service name as
 # a replacement for
 # "instl_boots".
-# Installation Bootstrap                                                                                                                                                                                               This entry is an alias to "instl-boots". This entry is now
-instl_boots    1067/udp        # Proto. Serv.                                                                                                                                                                                                         historic, not usable for use with many common service
+# Installation Bootstrap                                                                                                                                                                                                   This entry is an alias to "instl-boots". This entry is now
+instl_boots    1067/udp        # Proto. Serv.                                                                                                                                                                                                             historic, not usable for use with many common service
 # discovery mechanisms.
 # Installation Bootstrap
 # Proto. Cli.
@@ -2220,8 +2220,8 @@ instl-bootc       1068/tcp        # IANA assigned this           [David_Arko]
 # well-formed service name as
 # a replacement for
 # "instl_bootc".
-# Installation Bootstrap                                                                                                                                                                                               This entry is an alias to "instl-bootc". This entry is now
-instl_bootc    1068/tcp        # Proto. Cli.                  [David_Arko]                              [David_Arko]                                                                                                                                  historic, not usable for use with many common service
+# Installation Bootstrap                                                                                                                                                                                                   This entry is an alias to "instl-bootc". This entry is now
+instl_bootc    1068/tcp        # Proto. Cli.                  [David_Arko]                              [David_Arko]                                                                                                                                      historic, not usable for use with many common service
 # discovery mechanisms.
 # Installation Bootstrap
 # Proto. Cli.
@@ -2230,8 +2230,8 @@ instl-bootc       1068/udp        # IANA assigned this           [David_Arko]
 # well-formed service name as
 # a replacement for
 # "instl_bootc".
-# Installation Bootstrap                                                                                                                                                                                               This entry is an alias to "instl-bootc". This entry is now
-instl_bootc    1068/udp        # Proto. Cli.                  [David_Arko]                              [David_Arko]                                                                                                                                  historic, not usable for use with many common service
+# Installation Bootstrap                                                                                                                                                                                                   This entry is an alias to "instl-bootc". This entry is now
+instl_bootc    1068/udp        # Proto. Cli.                  [David_Arko]                              [David_Arko]                                                                                                                                      historic, not usable for use with many common service
 # discovery mechanisms.
 cognex-insight 1069/tcp        # COGNEX-INSIGHT               [Steve_Olson]                             [Steve_Olson]
 cognex-insight 1069/udp        # COGNEX-INSIGHT               [Steve_Olson]                             [Steve_Olson]
@@ -2401,7 +2401,7 @@ encrypted-admin   1138/tcp        # IANA assigned this           [Michael_Elizarov]
 # a replacement for
 # "encrypted_admin".
 # This entry is an alias to "encrypted-admin". This entry is
-encrypted_admin        1138/tcp        # encrypted admin requests     [Michael_Elizarov]                        [Michael_Elizarov]                                        2007-01                                                                             now historic, not usable for use with many common service
+encrypted_admin        1138/tcp        # encrypted admin requests     [Michael_Elizarov]                        [Michael_Elizarov]                                        2007-01                                                                                 now historic, not usable for use with many common service
 # discovery mechanisms.
 # encrypted admin requests
 # 
@@ -2410,7 +2410,7 @@ encrypted-admin   1138/udp        # IANA assigned this           [Michael_Elizarov]
 # a replacement for
 # "encrypted_admin".
 # This entry is an alias to "encrypted-admin". This entry is
-encrypted_admin        1138/udp        # encrypted admin requests     [Michael_Elizarov]                        [Michael_Elizarov]                                        2007-01                                                                             now historic, not usable for use with many common service
+encrypted_admin        1138/udp        # encrypted admin requests     [Michael_Elizarov]                        [Michael_Elizarov]                                        2007-01                                                                                 now historic, not usable for use with many common service
 # discovery mechanisms.
 evm    1139/tcp        # Enterprise Virtual Manager   [Thomas_Hennessy]                         [Thomas_Hennessy]                                         2007-10-04
 evm    1139/udp        # Enterprise Virtual Manager   [Thomas_Hennessy]                         [Thomas_Hennessy]                                         2007-10-04
@@ -2606,8 +2606,8 @@ periscope 1230/tcp        # Periscope                    [Kevin_Madden]
 periscope      1230/udp        # Periscope                    [Kevin_Madden]                            [Kevin_Madden]
 menandmice-lpm 1231/tcp        # menandmice-lpm               [Sigfus_Magnusson]                        [Sigfus_Magnusson]
 menandmice-lpm 1231/udp        # menandmice-lpm               [Sigfus_Magnusson]                        [Sigfus_Magnusson]
-# 1232        tcp    unassigned                                                                                                                                                                                                           Microsoft (unoffically) using 1232
-# 1232        udp    unassigned                                                                                                                                                                                                           Microsoft (unoffically) using 1232
+# 1232        tcp    unassigned                                                                                                                                                                                                               Microsoft (unoffically) using 1232
+# 1232        udp    unassigned                                                                                                                                                                                                               Microsoft (unoffically) using 1232
 univ-appserver 1233/tcp        # Universal App Server         [Tim_Sent]                                [Tim_Sent]
 univ-appserver 1233/udp        # Universal App Server         [Tim_Sent]                                [Tim_Sent]
 search-agent   1234/tcp        # Infoseek Search Agent        [Jackie_Wu]                               [Jackie_Wu]
@@ -2779,7 +2779,7 @@ bmc-patroldb      1313/tcp        # IANA assigned this           [Portnoy_Boxman]
 # a replacement for
 # "bmc_patroldb".
 # This entry is an alias to "bmc-patroldb". This entry is now
-bmc_patroldb   1313/tcp        # BMC_PATROLDB                 [Portnoy_Boxman]                          [Portnoy_Boxman]                                                                                                                              historic, not usable for use with many common service
+bmc_patroldb   1313/tcp        # BMC_PATROLDB                 [Portnoy_Boxman]                          [Portnoy_Boxman]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # BMC_PATROLDB
 # 
@@ -2788,7 +2788,7 @@ bmc-patroldb      1313/udp        # IANA assigned this           [Portnoy_Boxman]
 # a replacement for
 # "bmc_patroldb".
 # This entry is an alias to "bmc-patroldb". This entry is now
-bmc_patroldb   1313/udp        # BMC_PATROLDB                 [Portnoy_Boxman]                          [Portnoy_Boxman]                                                                                                                              historic, not usable for use with many common service
+bmc_patroldb   1313/udp        # BMC_PATROLDB                 [Portnoy_Boxman]                          [Portnoy_Boxman]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 pdps   1314/tcp        # Photoscript Distributed      [Les_Klein]                               [Les_Klein]
 # Printing System
@@ -2950,7 +2950,7 @@ udt-os    1382/tcp        # IANA assigned this
 # well-formed service name as
 # a replacement for "udt_os".
 # This entry is an alias to "udt-os". This entry is now
-udt_os 1382/tcp        # udt_os                                                                                                                                                                                                               historic, not usable for use with many common service
+udt_os 1382/tcp        # udt_os                                                                                                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # udt_os
 # 
@@ -2958,7 +2958,7 @@ udt-os    1382/udp        # IANA assigned this
 # well-formed service name as
 # a replacement for "udt_os".
 # This entry is an alias to "udt-os". This entry is now
-udt_os 1382/udp        # udt_os                                                                                                                                                                                                               historic, not usable for use with many common service
+udt_os 1382/udp        # udt_os                                                                                                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 gwha   1383/tcp        # GW Hannaway Network License  [J_Gabriel_Foster]                        [J_Gabriel_Foster]
 # Manager
@@ -2975,8 +2975,8 @@ atex-elmd 1385/tcp        # IANA assigned this           [Brett_Sorenson]
 # well-formed service name as
 # a replacement for
 # "atex_elmd".
-# Atex Publishing License                                                                                                                                                                                              This entry is an alias to "atex-elmd". This entry is now
-atex_elmd      1385/tcp        # Manager                      [Brett_Sorenson]                          [Brett_Sorenson]                                                                                                                              historic, not usable for use with many common service
+# Atex Publishing License                                                                                                                                                                                                  This entry is an alias to "atex-elmd". This entry is now
+atex_elmd      1385/tcp        # Manager                      [Brett_Sorenson]                          [Brett_Sorenson]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # Atex Publishing License
 # Manager
@@ -2985,8 +2985,8 @@ atex-elmd 1385/udp        # IANA assigned this           [Brett_Sorenson]
 # well-formed service name as
 # a replacement for
 # "atex_elmd".
-# Atex Publishing License                                                                                                                                                                                              This entry is an alias to "atex-elmd". This entry is now
-atex_elmd      1385/udp        # Manager                      [Brett_Sorenson]                          [Brett_Sorenson]                                                                                                                              historic, not usable for use with many common service
+# Atex Publishing License                                                                                                                                                                                                  This entry is an alias to "atex-elmd". This entry is now
+atex_elmd      1385/udp        # Manager                      [Brett_Sorenson]                          [Brett_Sorenson]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 checksum       1386/tcp        # CheckSum License Manager     [Andreas_Glocker]                         [Andreas_Glocker]
 checksum       1386/udp        # CheckSum License Manager     [Andreas_Glocker]                         [Andreas_Glocker]
@@ -3063,7 +3063,7 @@ novell-lu6-2      1416/tcp        # IANA assigned this           [Peter_Liu]
 # a replacement for
 # "novell-lu6.2".
 # This entry is an alias to "novell-lu6-2". This entry is now
-novell-lu6.2   1416/tcp        # Novell LU6.2                 [Peter_Liu]                               [Peter_Liu]                                                                                                                                   historic, not usable for use with many common service
+novell-lu6.2   1416/tcp        # Novell LU6.2                 [Peter_Liu]                               [Peter_Liu]                                                                                                                                       historic, not usable for use with many common service
 # discovery mechanisms.
 # Novell LU6.2
 # 
@@ -3072,7 +3072,7 @@ novell-lu6-2      1416/udp        # IANA assigned this           [Peter_Liu]
 # a replacement for
 # "novell-lu6.2".
 # This entry is an alias to "novell-lu6-2". This entry is now
-novell-lu6.2   1416/udp        # Novell LU6.2                 [Peter_Liu]                               [Peter_Liu]                                                                                                                                   historic, not usable for use with many common service
+novell-lu6.2   1416/udp        # Novell LU6.2                 [Peter_Liu]                               [Peter_Liu]                                                                                                                                       historic, not usable for use with many common service
 # discovery mechanisms.
 timbuktu-srv1  1417/tcp        # Timbuktu Service 1 Port
 timbuktu-srv1  1417/udp        # Timbuktu Service 1 Port
@@ -3173,7 +3173,7 @@ interhdl-elmd     1454/tcp        # IANA assigned this           [Eli_Sternheim]
 # a replacement for
 # "interhdl_elmd".
 # This entry is an alias to "interhdl-elmd". This entry is now
-interhdl_elmd  1454/tcp        # interHDL License Manager     [Eli_Sternheim]                           [Eli_Sternheim]                                                                                                                               historic, not usable for use with many common service
+interhdl_elmd  1454/tcp        # interHDL License Manager     [Eli_Sternheim]                           [Eli_Sternheim]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # interHDL License Manager
 # 
@@ -3182,7 +3182,7 @@ interhdl-elmd     1454/udp        # IANA assigned this           [Eli_Sternheim]
 # a replacement for
 # "interhdl_elmd".
 # This entry is an alias to "interhdl-elmd". This entry is now
-interhdl_elmd  1454/udp        # interHDL License Manager     [Eli_Sternheim]                           [Eli_Sternheim]                                                                                                                               historic, not usable for use with many common service
+interhdl_elmd  1454/udp        # interHDL License Manager     [Eli_Sternheim]                           [Eli_Sternheim]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 esl-lm 1455/tcp        # ESL License Manager          [Abel_Chou]                               [Abel_Chou]
 esl-lm 1455/udp        # ESL License Manager          [Abel_Chou]                               [Abel_Chou]
@@ -3207,7 +3207,7 @@ ibm-wrless-lan    1461/tcp        # IANA assigned this           [flanne]
 # a replacement for
 # "ibm_wrless_lan".
 # This entry is an alias to "ibm-wrless-lan". This entry is now
-ibm_wrless_lan 1461/tcp        # IBM Wireless LAN             [flanne]                                  [flanne]                                                                                                                                      historic, not usable for use with many common service
+ibm_wrless_lan 1461/tcp        # IBM Wireless LAN             [flanne]                                  [flanne]                                                                                                                                          historic, not usable for use with many common service
 # discovery mechanisms.
 # IBM Wireless LAN
 # 
@@ -3216,7 +3216,7 @@ ibm-wrless-lan    1461/udp        # IANA assigned this           [flanne]
 # a replacement for
 # "ibm_wrless_lan".
 # This entry is an alias to "ibm-wrless-lan". This entry is now
-ibm_wrless_lan 1461/udp        # IBM Wireless LAN             [flanne]                                  [flanne]                                                                                                                                      historic, not usable for use with many common service
+ibm_wrless_lan 1461/udp        # IBM Wireless LAN             [flanne]                                  [flanne]                                                                                                                                          historic, not usable for use with many common service
 # discovery mechanisms.
 world-lm       1462/tcp        # World License Manager        [Michael_S_Amirault]                      [Michael_S_Amirault]
 world-lm       1462/udp        # World License Manager        [Michael_S_Amirault]                      [Michael_S_Amirault]
@@ -3228,7 +3228,7 @@ msl-lmd   1464/tcp        # IANA assigned this           [Matt_Timmermans]
 # well-formed service name as
 # a replacement for "msl_lmd".
 # This entry is an alias to "msl-lmd". This entry is now
-msl_lmd        1464/tcp        # MSL License Manager          [Matt_Timmermans]                         [Matt_Timmermans]                                                                                                                             historic, not usable for use with many common service
+msl_lmd        1464/tcp        # MSL License Manager          [Matt_Timmermans]                         [Matt_Timmermans]                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # MSL License Manager
 # 
@@ -3236,7 +3236,7 @@ msl-lmd   1464/udp        # IANA assigned this           [Matt_Timmermans]
 # well-formed service name as
 # a replacement for "msl_lmd".
 # This entry is an alias to "msl-lmd". This entry is now
-msl_lmd        1464/udp        # MSL License Manager          [Matt_Timmermans]                         [Matt_Timmermans]                                                                                                                             historic, not usable for use with many common service
+msl_lmd        1464/udp        # MSL License Manager          [Matt_Timmermans]                         [Matt_Timmermans]                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 pipes  1465/tcp        # Pipes Platform               [Mark_Farlin]                             [Mark_Farlin]
 pipes  1465/udp        # Pipes Platform               [Mark_Farlin]                             [Mark_Farlin]
@@ -3291,7 +3291,7 @@ nms-topo-serv     1486/tcp        # IANA assigned this           [Sylvia_Siu]
 # a replacement for
 # "nms_topo_serv".
 # This entry is an alias to "nms-topo-serv". This entry is now
-nms_topo_serv  1486/tcp        # nms_topo_serv                [Sylvia_Siu]                              [Sylvia_Siu]                                                                                                                                  historic, not usable for use with many common service
+nms_topo_serv  1486/tcp        # nms_topo_serv                [Sylvia_Siu]                              [Sylvia_Siu]                                                                                                                                      historic, not usable for use with many common service
 # discovery mechanisms.
 # nms_topo_serv
 # 
@@ -3300,7 +3300,7 @@ nms-topo-serv     1486/udp        # IANA assigned this           [Sylvia_Siu]
 # a replacement for
 # "nms_topo_serv".
 # This entry is an alias to "nms-topo-serv". This entry is now
-nms_topo_serv  1486/udp        # nms_topo_serv                [Sylvia_Siu]                              [Sylvia_Siu]                                                                                                                                  historic, not usable for use with many common service
+nms_topo_serv  1486/udp        # nms_topo_serv                [Sylvia_Siu]                              [Sylvia_Siu]                                                                                                                                      historic, not usable for use with many common service
 # discovery mechanisms.
 localinfosrvr  1487/tcp        # LocalInfoSrvr                [Brian_Matthews_2]                        [Brian_Matthews_2]
 localinfosrvr  1487/udp        # LocalInfoSrvr                [Brian_Matthews_2]                        [Brian_Matthews_2]
@@ -3320,7 +3320,7 @@ netmap-lm 1493/tcp        # IANA assigned this           [Phillip_Magson]
 # a replacement for
 # "netmap_lm".
 # This entry is an alias to "netmap-lm". This entry is now
-netmap_lm      1493/tcp        # netmap_lm                    [Phillip_Magson]                          [Phillip_Magson]                                                                                                                              historic, not usable for use with many common service
+netmap_lm      1493/tcp        # netmap_lm                    [Phillip_Magson]                          [Phillip_Magson]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 # netmap_lm
 # 
@@ -3329,7 +3329,7 @@ netmap-lm 1493/udp        # IANA assigned this           [Phillip_Magson]
 # a replacement for
 # "netmap_lm".
 # This entry is an alias to "netmap-lm". This entry is now
-netmap_lm      1493/udp        # netmap_lm                    [Phillip_Magson]                          [Phillip_Magson]                                                                                                                              historic, not usable for use with many common service
+netmap_lm      1493/udp        # netmap_lm                    [Phillip_Magson]                          [Phillip_Magson]                                                                                                                                  historic, not usable for use with many common service
 # discovery mechanisms.
 ica    1494/tcp        # ica                          [John_Richardson]                         [John_Richardson]
 ica    1494/udp        # ica                          [John_Richardson]                         [John_Richardson]
@@ -3485,8 +3485,8 @@ veritas-pbx       1556/tcp        # IANA assigned this           [Stefan_Winkel]
 # well-formed service name as
 # a replacement for
 # "veritas_pbx".
-# VERITAS Private Branch                                                                                                                                                                                               This entry is an alias to "veritas-pbx". This entry is now
-veritas_pbx    1556/tcp        # Exchange                     [Stefan_Winkel]                           [Stefan_Winkel]                                           2004-04                                                                             historic, not usable for use with many common service
+# VERITAS Private Branch                                                                                                                                                                                                   This entry is an alias to "veritas-pbx". This entry is now
+veritas_pbx    1556/tcp        # Exchange                     [Stefan_Winkel]                           [Stefan_Winkel]                                           2004-04                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # VERITAS Private Branch
 # Exchange
@@ -3495,8 +3495,8 @@ veritas-pbx       1556/udp        # IANA assigned this           [Stefan_Winkel]
 # well-formed service name as
 # a replacement for
 # "veritas_pbx".
-# VERITAS Private Branch                                                                                                                                                                                               This entry is an alias to "veritas-pbx". This entry is now
-veritas_pbx    1556/udp        # Exchange                     [Stefan_Winkel]                           [Stefan_Winkel]                                           2004-04                                                                             historic, not usable for use with many common service
+# VERITAS Private Branch                                                                                                                                                                                                   This entry is an alias to "veritas-pbx". This entry is now
+veritas_pbx    1556/udp        # Exchange                     [Stefan_Winkel]                           [Stefan_Winkel]                                           2004-04                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 arbortext-lm   1557/tcp        # ArborText License Manager    [David_J_Wilson]                          [David_J_Wilson]
 arbortext-lm   1557/udp        # ArborText License Manager    [David_J_Wilson]                          [David_J_Wilson]
@@ -3565,7 +3565,7 @@ pra-elmd  1587/tcp        # IANA assigned this           [Dennis_Mastin]
 # a replacement for
 # "pra_elmd".
 # This entry is an alias to "pra-elmd". This entry is now
-pra_elmd       1587/tcp        # pra_elmd                     [Dennis_Mastin]                           [Dennis_Mastin]                                                                                                                               historic, not usable for use with many common service
+pra_elmd       1587/tcp        # pra_elmd                     [Dennis_Mastin]                           [Dennis_Mastin]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # pra_elmd
 # 
@@ -3574,7 +3574,7 @@ pra-elmd  1587/udp        # IANA assigned this           [Dennis_Mastin]
 # a replacement for
 # "pra_elmd".
 # This entry is an alias to "pra-elmd". This entry is now
-pra_elmd       1587/udp        # pra_elmd                     [Dennis_Mastin]                           [Dennis_Mastin]                                                                                                                               historic, not usable for use with many common service
+pra_elmd       1587/udp        # pra_elmd                     [Dennis_Mastin]                           [Dennis_Mastin]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 triquest-lm    1588/tcp        # triquest-lm                  [Nand_Kumar]                              [Nand_Kumar]
 triquest-lm    1588/udp        # triquest-lm                  [Nand_Kumar]                              [Nand_Kumar]
@@ -3719,7 +3719,7 @@ shiva-confsrvr    1651/tcp        # IANA assigned this           [Mike_Horowitz]
 # a replacement for
 # "shiva_confsrvr".
 # This entry is an alias to "shiva-confsrvr". This entry is now
-shiva_confsrvr 1651/tcp        # shiva_confsrvr               [Mike_Horowitz]                           [Mike_Horowitz]                                                                                                                               historic, not usable for use with many common service
+shiva_confsrvr 1651/tcp        # shiva_confsrvr               [Mike_Horowitz]                           [Mike_Horowitz]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # shiva_confsrvr
 # 
@@ -3728,7 +3728,7 @@ shiva-confsrvr    1651/udp        # IANA assigned this           [Mike_Horowitz]
 # a replacement for
 # "shiva_confsrvr".
 # This entry is an alias to "shiva-confsrvr". This entry is now
-shiva_confsrvr 1651/udp        # shiva_confsrvr               [Mike_Horowitz]                           [Mike_Horowitz]                                                                                                                               historic, not usable for use with many common service
+shiva_confsrvr 1651/udp        # shiva_confsrvr               [Mike_Horowitz]                           [Mike_Horowitz]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 xnmp   1652/tcp        # xnmp                         [Ali_Saleh]                               [Ali_Saleh]
 xnmp   1652/udp        # xnmp                         [Ali_Saleh]                               [Ali_Saleh]
@@ -4246,8 +4246,8 @@ elad      1893/tcp        # ELAD Protocol                [Franco_Milan]
 elad   1893/udp        # ELAD Protocol                [Franco_Milan]                            [Franco_Milan]
 o2server-port  1894/tcp        # O2Server Port                [Tim_Howard]                              [Tim_Howard]
 o2server-port  1894/udp        # O2Server Port                [Tim_Howard]                              [Tim_Howard]
-# 1895        tcp    unassigned                                                                                                                                                                                                           Microsoft (unoffically) using 1895
-# 1895        udp    unassigned                                                                                                                                                                                                           Microsoft (unoffically) using 1895
+# 1895        tcp    unassigned                                                                                                                                                                                                               Microsoft (unoffically) using 1895
+# 1895        udp    unassigned                                                                                                                                                                                                               Microsoft (unoffically) using 1895
 b-novative-ls  1896/tcp        # b-novative license server    [Matthias_Riese]                          [Matthias_Riese]
 b-novative-ls  1896/udp        # b-novative license server    [Matthias_Riese]                          [Matthias_Riese]
 metaagent      1897/tcp        # MetaAgent                    [Marie_France_Dubreui]                    [Marie_France_Dubreui]
@@ -4460,16 +4460,16 @@ tr-rsrb-p2      1988/tcp        # cisco RSRB Priority 2 port
 tr-rsrb-p2     1988/udp        # cisco RSRB Priority 2 port
 tr-rsrb-p3     1989/tcp        # cisco RSRB Priority 3 port
 tr-rsrb-p3     1989/udp        # cisco RSRB Priority 3 port
-mshnet 1989/tcp        # MHSnet system                [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                              This entry records an unassigned but widespread use
-mshnet 1989/udp        # MHSnet system                [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                              This entry records an unassigned but widespread use
+mshnet 1989/tcp        # MHSnet system                [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                                  This entry records an unassigned but widespread use
+mshnet 1989/udp        # MHSnet system                [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                                  This entry records an unassigned but widespread use
 stun-p1        1990/tcp        # cisco STUN Priority 1 port
 stun-p1        1990/udp        # cisco STUN Priority 1 port
 stun-p2        1991/tcp        # cisco STUN Priority 2 port
 stun-p2        1991/udp        # cisco STUN Priority 2 port
 stun-p3        1992/tcp        # cisco STUN Priority 3 port
 stun-p3        1992/udp        # cisco STUN Priority 3 port
-ipsendmsg      1992/tcp        # IPsendmsg                    [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                              This entry records an unassigned but widespread use
-ipsendmsg      1992/udp        # IPsendmsg                    [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                              This entry records an unassigned but widespread use
+ipsendmsg      1992/tcp        # IPsendmsg                    [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                                  This entry records an unassigned but widespread use
+ipsendmsg      1992/udp        # IPsendmsg                    [Bob_Kummerfeld]                          [Bob_Kummerfeld]                                                                                                                                  This entry records an unassigned but widespread use
 snmp-tcp-port  1993/tcp        # cisco SNMP TCP port
 snmp-tcp-port  1993/udp        # cisco SNMP TCP port
 stun-port      1994/tcp        # cisco serial tunnel port
@@ -4568,8 +4568,8 @@ mobrien-chat      2031/udp        # mobrien-chat                 [Mike_O_Brien]
 # imsldoc            2035        udp
 e-dpnet        2036/tcp        # Ethernet WS DP network       [Peter_Kaever]                            [Peter_Kaever]                                            2005-08
 e-dpnet        2036/udp        # Ethernet WS DP network       [Peter_Kaever]                            [Peter_Kaever]                                            2005-08
-applus 2037/tcp        # APplus Application Server    [Thomas_Boerkel]                          [Thomas_Boerkel]                                          2008-06-06                                                                          Formerly was P2plus Application Server
-applus 2037/udp        # APplus Application Server    [Thomas_Boerkel]                          [Thomas_Boerkel]                                          2008-06-06                                                                          Formerly was P2plus Application Server
+applus 2037/tcp        # APplus Application Server    [Thomas_Boerkel]                          [Thomas_Boerkel]                                          2008-06-06                                                                              Formerly was P2plus Application Server
+applus 2037/udp        # APplus Application Server    [Thomas_Boerkel]                          [Thomas_Boerkel]                                          2008-06-06                                                                              Formerly was P2plus Application Server
 # objectmanager      2038        tcp
 # objectmanager      2038        udp
 prizma 2039/tcp        # Prizma Monitoring Service    [Dotan_Ofek]                              [Dotan_Ofek]                                              2005-12
@@ -4596,11 +4596,11 @@ isis-bcast      2043/udp        # isis-bcast                   [Ken_Chapman]
 # shilp        2049/tcp        # <== NOTE Conflict on 2049 !
 # Excluded by ./tools/make-services.pl
 # shilp        2049/udp        # <== NOTE Conflict on 2049 !
-nfs    2049/tcp        # Network File System - Sun    [Brent_Callaghan]                         [Brent_Callaghan]                                                                                                                             Defined TXT keys: path=<path to mount point>
+nfs    2049/tcp        # Network File System - Sun    [Brent_Callaghan]                         [Brent_Callaghan]                                                                                                                                 Defined TXT keys: path=<path to mount point>
 # Microsystems
-nfs    2049/udp        # Network File System - Sun    [Brent_Callaghan]                         [Brent_Callaghan]                                                                                                                             Defined TXT keys: path=<path to mount point>
+nfs    2049/udp        # Network File System - Sun    [Brent_Callaghan]                         [Brent_Callaghan]                                                                                                                                 Defined TXT keys: path=<path to mount point>
 # Microsystems
-nfs    2049/sctp       # Network File System                                                                                                                                        [RFC5665]                                                 Defined TXT keys: path=<path to mount point>
+nfs    2049/sctp       # Network File System                                                                                                                                        [RFC5665]                                                     Defined TXT keys: path=<path to mount point>
 av-emb-config  2050/tcp        # Avaya EMB Config Port        [John_Yeager]                             [John_Yeager]
 av-emb-config  2050/udp        # Avaya EMB Config Port        [John_Yeager]                             [John_Yeager]
 epnsdp 2051/tcp        # EPNSDP                       [Hiroyasu_Ogata]                          [Hiroyasu_Ogata]
@@ -4996,21 +4996,21 @@ rockwell-csp1   2221/tcp        # Rockwell CSP1                [Brian_Batke]
 rockwell-csp1  2221/udp        # Rockwell CSP1                [Brian_Batke]                             [Brian_Batke]
 # EtherNet/IP I/O
 # 
-EtherNet-IP-1  2222/tcp        # IANA assigned this           [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                               New contact added for port 2222 on 2008-02-01
+EtherNet-IP-1  2222/tcp        # IANA assigned this           [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                                   New contact added for port 2222 on 2008-02-01
 # well-formed service name as
 # a replacement for
 # "EtherNet/IP-1".
 # New contact added for port 2222 on 2008-02-01 This entry is
-EtherNet/IP-1  2222/tcp        # EtherNet/IP I/O              [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                               an alias to "EtherNet-IP-1". This entry is now historic, not
+EtherNet/IP-1  2222/tcp        # EtherNet/IP I/O              [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                                   an alias to "EtherNet-IP-1". This entry is now historic, not
 # usable for use with many common service discovery mechanisms.
 # EtherNet/IP I/O
 # 
-EtherNet-IP-1  2222/udp        # IANA assigned this           [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                               New contact added for port 2222 on 2008-02-01
+EtherNet-IP-1  2222/udp        # IANA assigned this           [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                                   New contact added for port 2222 on 2008-02-01
 # well-formed service name as
 # a replacement for
 # "EtherNet/IP-1".
 # New contact added for port 2222 on 2008-02-01 This entry is
-EtherNet/IP-1  2222/udp        # EtherNet/IP I/O              [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                               an alias to "EtherNet-IP-1". This entry is now historic, not
+EtherNet/IP-1  2222/udp        # EtherNet/IP I/O              [Brian_Batke_2]                           [Brian_Batke_2]                                                                                                                                   an alias to "EtherNet-IP-1". This entry is now historic, not
 # usable for use with many common service discovery mechanisms.
 rockwell-csp2  2223/tcp        # Rockwell CSP2                [Brian_Batke]                             [Brian_Batke]
 rockwell-csp2  2223/udp        # Rockwell CSP2                [Brian_Batke]                             [Brian_Batke]
@@ -5251,8 +5251,8 @@ ofsd      2322/udp        # ofsd
 3d-nfsd        2323/udp        # 3d-nfsd                      [Mike_Sherrill]                           [Mike_Sherrill]
 cosmocall      2324/tcp        # Cosmocall                    [Steve_Dellutri]                          [Steve_Dellutri]
 cosmocall      2324/udp        # Cosmocall                    [Steve_Dellutri]                          [Steve_Dellutri]
-ansysli        2325/tcp        # ANSYS Licensing Interconnect [Suzanne_Lorrin]                          [Suzanne_Lorrin]                                                                                                                              Modified: 27 October 2008
-ansysli        2325/udp        # ANSYS Licensing Interconnect [Suzanne_Lorrin]                          [Suzanne_Lorrin]                                                                                                                              Modified: 27 October 2008
+ansysli        2325/tcp        # ANSYS Licensing Interconnect [Suzanne_Lorrin]                          [Suzanne_Lorrin]                                                                                                                                  Modified: 27 October 2008
+ansysli        2325/udp        # ANSYS Licensing Interconnect [Suzanne_Lorrin]                          [Suzanne_Lorrin]                                                                                                                                  Modified: 27 October 2008
 idcp   2326/tcp        # IDCP                         [Keisokugiken_Corp]                       [Keisokugiken_Corp]
 idcp   2326/udp        # IDCP                         [Keisokugiken_Corp]                       [Keisokugiken_Corp]
 xingcsm        2327/tcp        # xingcsm                      [Dave_Spencer]                            [Dave_Spencer]
@@ -5288,7 +5288,7 @@ wrs-registry      2340/tcp        # IANA assigned this           [Christophe_Cleraux]
 # a replacement for
 # "wrs_registry".
 # This entry is an alias to "wrs-registry". This entry is now
-wrs_registry   2340/tcp        # WRS Registry                 [Christophe_Cleraux]                      [Christophe_Cleraux]                                                                                                                          historic, not usable for use with many common service
+wrs_registry   2340/tcp        # WRS Registry                 [Christophe_Cleraux]                      [Christophe_Cleraux]                                                                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # WRS Registry
 # 
@@ -5297,7 +5297,7 @@ wrs-registry      2340/udp        # IANA assigned this           [Christophe_Cleraux]
 # a replacement for
 # "wrs_registry".
 # This entry is an alias to "wrs-registry". This entry is now
-wrs_registry   2340/udp        # WRS Registry                 [Christophe_Cleraux]                      [Christophe_Cleraux]                                                                                                                          historic, not usable for use with many common service
+wrs_registry   2340/udp        # WRS Registry                 [Christophe_Cleraux]                      [Christophe_Cleraux]                                                                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 xiostatus      2341/tcp        # XIO Status                   [Randy_Maas]                              [Randy_Maas]
 xiostatus      2341/udp        # XIO Status                   [Randy_Maas]                              [Randy_Maas]
@@ -5316,7 +5316,7 @@ redstorm-join     2346/tcp        # IANA assigned this
 # a replacement for
 # "redstorm_join".
 # This entry is an alias to "redstorm-join". This entry is now
-redstorm_join  2346/tcp        # Game Connection Port                                                                                                                                                                                                 historic, not usable for use with many common service
+redstorm_join  2346/tcp        # Game Connection Port                                                                                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # Game Connection Port
 # 
@@ -5325,7 +5325,7 @@ redstorm-join     2346/udp        # IANA assigned this
 # a replacement for
 # "redstorm_join".
 # This entry is an alias to "redstorm-join". This entry is now
-redstorm_join  2346/udp        # Game Connection Port                                                                                                                                                                                                 historic, not usable for use with many common service
+redstorm_join  2346/udp        # Game Connection Port                                                                                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # Game Announcement and
 # Location
@@ -5334,8 +5334,8 @@ redstorm-find     2347/tcp        # IANA assigned this
 # well-formed service name as
 # a replacement for
 # "redstorm_find".
-# Game Announcement and                                                                                                                                                                                                This entry is an alias to "redstorm-find". This entry is now
-redstorm_find  2347/tcp        # Location                                                                                                                                                                                                             historic, not usable for use with many common service
+# Game Announcement and                                                                                                                                                                                                    This entry is an alias to "redstorm-find". This entry is now
+redstorm_find  2347/tcp        # Location                                                                                                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # Game Announcement and
 # Location
@@ -5344,8 +5344,8 @@ redstorm-find     2347/udp        # IANA assigned this
 # well-formed service name as
 # a replacement for
 # "redstorm_find".
-# Game Announcement and                                                                                                                                                                                                This entry is an alias to "redstorm-find". This entry is now
-redstorm_find  2347/udp        # Location                                                                                                                                                                                                             historic, not usable for use with many common service
+# Game Announcement and                                                                                                                                                                                                    This entry is an alias to "redstorm-find". This entry is now
+redstorm_find  2347/udp        # Location                                                                                                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # Information to query for
 # game status
@@ -5354,8 +5354,8 @@ redstorm-info     2348/tcp        # IANA assigned this
 # well-formed service name as
 # a replacement for
 # "redstorm_info".
-# Information to query for                                                                                                                                                                                             This entry is an alias to "redstorm-info". This entry is now
-redstorm_info  2348/tcp        # game status                                                                                                                                                                                                          historic, not usable for use with many common service
+# Information to query for                                                                                                                                                                                                 This entry is an alias to "redstorm-info". This entry is now
+redstorm_info  2348/tcp        # game status                                                                                                                                                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # Information to query for
 # game status
@@ -5364,8 +5364,8 @@ redstorm-info     2348/udp        # IANA assigned this
 # well-formed service name as
 # a replacement for
 # "redstorm_info".
-# Information to query for                                                                                                                                                                                             This entry is an alias to "redstorm-info". This entry is now
-redstorm_info  2348/udp        # game status                                                                                                                                                                                                          historic, not usable for use with many common service
+# Information to query for                                                                                                                                                                                                 This entry is an alias to "redstorm-info". This entry is now
+redstorm_info  2348/udp        # game status                                                                                                                                                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # Diagnostics Port
 # 
@@ -5374,7 +5374,7 @@ redstorm-diag     2349/tcp        # IANA assigned this           [David_Weinstein]
 # a replacement for
 # "redstorm_diag".
 # This entry is an alias to "redstorm-diag". This entry is now
-redstorm_diag  2349/tcp        # Diagnostics Port             [David_Weinstein]                         [David_Weinstein]                                                                                                                             historic, not usable for use with many common service
+redstorm_diag  2349/tcp        # Diagnostics Port             [David_Weinstein]                         [David_Weinstein]                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # Diagnostics Port
 # 
@@ -5383,7 +5383,7 @@ redstorm-diag     2349/udp        # IANA assigned this           [David_Weinstein]
 # a replacement for
 # "redstorm_diag".
 # This entry is an alias to "redstorm-diag". This entry is now
-redstorm_diag  2349/udp        # Diagnostics Port             [David_Weinstein]                         [David_Weinstein]                                                                                                                             historic, not usable for use with many common service
+redstorm_diag  2349/udp        # Diagnostics Port             [David_Weinstein]                         [David_Weinstein]                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 psbserver      2350/tcp        # Pharos Booking Server
 psbserver      2350/udp        # Pharos Booking Server
@@ -5423,13 +5423,13 @@ service-ctrl    2367/tcp        # Service Control              [Humberto_Sanchez]
 service-ctrl   2367/udp        # Service Control              [Humberto_Sanchez]                        [Humberto_Sanchez]
 opentable      2368/tcp        # OpenTable                    [Brett_Goldstein]                         [Brett_Goldstein]
 opentable      2368/udp        # OpenTable                    [Brett_Goldstein]                         [Brett_Goldstein]
-# 2369               Unassigned                                                                                                                                                                                                           De-registered (28 March 2006)
+# 2369               Unassigned                                                                                                                                                                                                               De-registered (28 March 2006)
 # Port 2370
-l3-hbmon       2370/tcp        # L3-HBMon                     [Dolores_Scott]                           [Dolores_Scott]                                                                                                                  Unofficially
+l3-hbmon       2370/tcp        # L3-HBMon                     [Dolores_Scott]                           [Dolores_Scott]                                                                                                                      Unofficially
 # used by
 # Compaq
 # Port 2370
-l3-hbmon       2370/udp        # L3-HBMon                     [Dolores_Scott]                           [Dolores_Scott]                                                                                                                  Unofficially
+l3-hbmon       2370/udp        # L3-HBMon                     [Dolores_Scott]                           [Dolores_Scott]                                                                                                                      Unofficially
 # used by
 # Compaq
 worldwire      2371/tcp        # Compaq WorldWire Port        [Michael_Spratte]                         [Michael_Spratte]
@@ -5476,7 +5476,7 @@ lan900-remote     2395/tcp        # IANA assigned this           [Tom_Quinlan]
 # a replacement for
 # "lan900_remote".
 # This entry is an alias to "lan900-remote". This entry is now
-lan900_remote  2395/tcp        # LAN900 Remote                [Tom_Quinlan]                             [Tom_Quinlan]                                                                                                                                 historic, not usable for use with many common service
+lan900_remote  2395/tcp        # LAN900 Remote                [Tom_Quinlan]                             [Tom_Quinlan]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # LAN900 Remote
 # 
@@ -5485,7 +5485,7 @@ lan900-remote     2395/udp        # IANA assigned this           [Tom_Quinlan]
 # a replacement for
 # "lan900_remote".
 # This entry is an alias to "lan900-remote". This entry is now
-lan900_remote  2395/udp        # LAN900 Remote                [Tom_Quinlan]                             [Tom_Quinlan]                                                                                                                                 historic, not usable for use with many common service
+lan900_remote  2395/udp        # LAN900 Remote                [Tom_Quinlan]                             [Tom_Quinlan]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 wusage 2396/tcp        # Wusage                       [Thomas_Boutell]                          [Thomas_Boutell]
 wusage 2396/udp        # Wusage                       [Thomas_Boutell]                          [Thomas_Boutell]
@@ -5603,7 +5603,7 @@ bues-service      2446/tcp        # IANA assigned this           [Leonhard_Diekmann]
 # a replacement for
 # "bues_service".
 # This entry is an alias to "bues-service". This entry is now
-bues_service   2446/tcp        # bues_service                 [Leonhard_Diekmann]                       [Leonhard_Diekmann]                                                                                                                           historic, not usable for use with many common service
+bues_service   2446/tcp        # bues_service                 [Leonhard_Diekmann]                       [Leonhard_Diekmann]                                                                                                                               historic, not usable for use with many common service
 # discovery mechanisms.
 # bues_service
 # 
@@ -5612,7 +5612,7 @@ bues-service      2446/udp        # IANA assigned this           [Leonhard_Diekmann]
 # a replacement for
 # "bues_service".
 # This entry is an alias to "bues-service". This entry is now
-bues_service   2446/udp        # bues_service                 [Leonhard_Diekmann]                       [Leonhard_Diekmann]                                                                                                                           historic, not usable for use with many common service
+bues_service   2446/udp        # bues_service                 [Leonhard_Diekmann]                       [Leonhard_Diekmann]                                                                                                                               historic, not usable for use with many common service
 # discovery mechanisms.
 ovwdb  2447/tcp        # OpenView NNM daemon          [Eric_Pulsipher_2]                        [Eric_Pulsipher_2]
 ovwdb  2447/udp        # OpenView NNM daemon          [Eric_Pulsipher_2]                        [Eric_Pulsipher_2]
@@ -5796,7 +5796,7 @@ ncr-ccl   2528/tcp        # IANA assigned this           [Amitava_Dutta]
 # well-formed service name as
 # a replacement for "ncr_ccl".
 # This entry is an alias to "ncr-ccl". This entry is now
-ncr_ccl        2528/tcp        # NCR CCL                      [Amitava_Dutta]                           [Amitava_Dutta]                                                                                                                               historic, not usable for use with many common service
+ncr_ccl        2528/tcp        # NCR CCL                      [Amitava_Dutta]                           [Amitava_Dutta]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # NCR CCL
 # 
@@ -5804,7 +5804,7 @@ ncr-ccl   2528/udp        # IANA assigned this           [Amitava_Dutta]
 # well-formed service name as
 # a replacement for "ncr_ccl".
 # This entry is an alias to "ncr-ccl". This entry is now
-ncr_ccl        2528/udp        # NCR CCL                      [Amitava_Dutta]                           [Amitava_Dutta]                                                                                                                               historic, not usable for use with many common service
+ncr_ccl        2528/udp        # NCR CCL                      [Amitava_Dutta]                           [Amitava_Dutta]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 utsftp 2529/tcp        # UTS FTP                      [David_Moore]                             [David_Moore]
 utsftp 2529/udp        # UTS FTP                      [David_Moore]                             [David_Moore]
@@ -6035,8 +6035,8 @@ sai-sentlm        2640/tcp        # IANA assigned this           [Elias_Sabbagh]
 # well-formed service name as
 # a replacement for
 # "sai_sentlm".
-# Sabbagh Associates Licence                                                                                                                                                                                           This entry is an alias to "sai-sentlm". This entry is now
-sai_sentlm     2640/tcp        # Manager                      [Elias_Sabbagh]                           [Elias_Sabbagh]                                                                                                                               historic, not usable for use with many common service
+# Sabbagh Associates Licence                                                                                                                                                                                               This entry is an alias to "sai-sentlm". This entry is now
+sai_sentlm     2640/tcp        # Manager                      [Elias_Sabbagh]                           [Elias_Sabbagh]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # Sabbagh Associates Licence
 # Manager
@@ -6045,8 +6045,8 @@ sai-sentlm        2640/udp        # IANA assigned this           [Elias_Sabbagh]
 # well-formed service name as
 # a replacement for
 # "sai_sentlm".
-# Sabbagh Associates Licence                                                                                                                                                                                           This entry is an alias to "sai-sentlm". This entry is now
-sai_sentlm     2640/udp        # Manager                      [Elias_Sabbagh]                           [Elias_Sabbagh]                                                                                                                               historic, not usable for use with many common service
+# Sabbagh Associates Licence                                                                                                                                                                                               This entry is an alias to "sai-sentlm". This entry is now
+sai_sentlm     2640/udp        # Manager                      [Elias_Sabbagh]                           [Elias_Sabbagh]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 hdl-srv        2641/tcp        # HDL Server                   [David_Ely]                               [David_Ely]
 hdl-srv        2641/udp        # HDL Server                   [David_Ely]                               [David_Ely]
@@ -6081,7 +6081,7 @@ corel-vncadmin    2654/tcp        # IANA assigned this           [Oleg_Noskov]
 # a replacement for
 # "corel_vncadmin".
 # This entry is an alias to "corel-vncadmin". This entry is now
-corel_vncadmin 2654/tcp        # Corel VNC Admin              [Oleg_Noskov]                             [Oleg_Noskov]                                                                                                                                 historic, not usable for use with many common service
+corel_vncadmin 2654/tcp        # Corel VNC Admin              [Oleg_Noskov]                             [Oleg_Noskov]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # Corel VNC Admin
 # 
@@ -6090,7 +6090,7 @@ corel-vncadmin    2654/udp        # IANA assigned this           [Oleg_Noskov]
 # a replacement for
 # "corel_vncadmin".
 # This entry is an alias to "corel-vncadmin". This entry is now
-corel_vncadmin 2654/udp        # Corel VNC Admin              [Oleg_Noskov]                             [Oleg_Noskov]                                                                                                                                 historic, not usable for use with many common service
+corel_vncadmin 2654/udp        # Corel VNC Admin              [Oleg_Noskov]                             [Oleg_Noskov]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 unglue 2655/tcp        # UNIX Nt Glue                 [Peter_Santoro]                           [Peter_Santoro]
 unglue 2655/udp        # UNIX Nt Glue                 [Peter_Santoro]                           [Peter_Santoro]
@@ -6167,8 +6167,8 @@ itinternet        2691/tcp        # ITInternet ISM Server        [Ron_Ehli]
 itinternet     2691/udp        # ITInternet ISM Server        [Ron_Ehli]                                [Ron_Ehli]
 admins-lms     2692/tcp        # Admins LMS                   [Dagfinn_Saether]                         [Dagfinn_Saether]
 admins-lms     2692/udp        # Admins LMS                   [Dagfinn_Saether]                         [Dagfinn_Saether]
-# 2693        tcp    Unassigned                                                                                                                                                                                                           (Removed 2004-2-6)
-# 2693        udp    Unassigned                                                                                                                                                                                                           (Removed 2004-2-6)
+# 2693        tcp    Unassigned                                                                                                                                                                                                               (Removed 2004-2-6)
+# 2693        udp    Unassigned                                                                                                                                                                                                               (Removed 2004-2-6)
 pwrsevent      2694/tcp        # pwrsevent                    [Yoshinobu_Nakamura]                      [Yoshinobu_Nakamura]
 pwrsevent      2694/udp        # pwrsevent                    [Yoshinobu_Nakamura]                      [Yoshinobu_Nakamura]
 vspread        2695/tcp        # VSPREAD                      [Sumitake_kobayashi]                      [Sumitake_kobayashi]
@@ -6642,7 +6642,7 @@ elvin-server      2916/tcp        # IANA assigned this
 # a replacement for
 # "elvin_server".
 # This entry is an alias to "elvin-server". This entry is now
-elvin_server   2916/tcp        # Elvin Server                                                                                                                                                                                                         historic, not usable for use with many common service
+elvin_server   2916/tcp        # Elvin Server                                                                                                                                                                                                             historic, not usable for use with many common service
 # discovery mechanisms.
 # Elvin Server
 # 
@@ -6651,7 +6651,7 @@ elvin-server      2916/udp        # IANA assigned this
 # a replacement for
 # "elvin_server".
 # This entry is an alias to "elvin-server". This entry is now
-elvin_server   2916/udp        # Elvin Server                                                                                                                                                                                                         historic, not usable for use with many common service
+elvin_server   2916/udp        # Elvin Server                                                                                                                                                                                                             historic, not usable for use with many common service
 # discovery mechanisms.
 # Elvin Client
 # 
@@ -6660,7 +6660,7 @@ elvin-client      2917/tcp        # IANA assigned this           [David_Arnold]
 # a replacement for
 # "elvin_client".
 # This entry is an alias to "elvin-client". This entry is now
-elvin_client   2917/tcp        # Elvin Client                 [David_Arnold]                            [David_Arnold]                                                                                                                                historic, not usable for use with many common service
+elvin_client   2917/tcp        # Elvin Client                 [David_Arnold]                            [David_Arnold]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 # Elvin Client
 # 
@@ -6669,7 +6669,7 @@ elvin-client      2917/udp        # IANA assigned this           [David_Arnold]
 # a replacement for
 # "elvin_client".
 # This entry is an alias to "elvin-client". This entry is now
-elvin_client   2917/udp        # Elvin Client                 [David_Arnold]                            [David_Arnold]                                                                                                                                historic, not usable for use with many common service
+elvin_client   2917/udp        # Elvin Client                 [David_Arnold]                            [David_Arnold]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 kastenchasepad 2918/tcp        # Kasten Chase Pad             [Marc_Gauthier]                           [Marc_Gauthier]
 kastenchasepad 2918/udp        # Kasten Chase Pad             [Marc_Gauthier]                           [Marc_Gauthier]
@@ -6853,13 +6853,13 @@ remoteware-un   2999/tcp        # RemoteWare Unassigned        [Tim_Farley]
 remoteware-un  2999/udp        # RemoteWare Unassigned        [Tim_Farley]                              [Tim_Farley]
 hbci   3000/tcp        # HBCI                         [Kurt_Haubner]                            [Kurt_Haubner]
 hbci   3000/udp        # HBCI                         [Kurt_Haubner]                            [Kurt_Haubner]
-remoteware-cl  3000/tcp        # RemoteWare Client            [Tim_Farley]                              [Tim_Farley]                                                                                                                                  This entry records an unassigned but widespread use
-remoteware-cl  3000/udp        # RemoteWare Client            [Tim_Farley]                              [Tim_Farley]                                                                                                                                  This entry records an unassigned but widespread use
+remoteware-cl  3000/tcp        # RemoteWare Client            [Tim_Farley]                              [Tim_Farley]                                                                                                                                      This entry records an unassigned but widespread use
+remoteware-cl  3000/udp        # RemoteWare Client            [Tim_Farley]                              [Tim_Farley]                                                                                                                                      This entry records an unassigned but widespread use
 # 3001               Unassigned                                                                                                                                    2006-05-25
 exlm-agent     3002/tcp        # EXLM Agent                   [Randy_Martin]                            [Randy_Martin]
 exlm-agent     3002/udp        # EXLM Agent                   [Randy_Martin]                            [Randy_Martin]
-remoteware-srv 3002/tcp        # RemoteWare Server            [Tim_Farley]                              [Tim_Farley]                                                                                                                                  This entry records an unassigned but widespread use
-remoteware-srv 3002/udp        # RemoteWare Server            [Tim_Farley]                              [Tim_Farley]                                                                                                                                  This entry records an unassigned but widespread use
+remoteware-srv 3002/tcp        # RemoteWare Server            [Tim_Farley]                              [Tim_Farley]                                                                                                                                      This entry records an unassigned but widespread use
+remoteware-srv 3002/udp        # RemoteWare Server            [Tim_Farley]                              [Tim_Farley]                                                                                                                                      This entry records an unassigned but widespread use
 cgms   3003/tcp        # CGMS                         [Corey_Clinton]                           [Corey_Clinton]                                           2011-02-02
 cgms   3003/udp        # CGMS                         [Corey_Clinton]                           [Corey_Clinton]                                           2011-02-02
 csoftragent    3004/tcp        # Csoft Agent                  [Nedelcho_Stanev_2]                       [Nedelcho_Stanev_2]
@@ -6891,7 +6891,7 @@ broker-service    3014/tcp        # IANA assigned this           [Dale_Bethers]
 # a replacement for
 # "broker_service".
 # This entry is an alias to "broker-service". This entry is now
-broker_service 3014/tcp        # Broker Service               [Dale_Bethers]                            [Dale_Bethers]                                                                                                                                historic, not usable for use with many common service
+broker_service 3014/tcp        # Broker Service               [Dale_Bethers]                            [Dale_Bethers]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 # Broker Service
 # 
@@ -6900,7 +6900,7 @@ broker-service    3014/udp        # IANA assigned this           [Dale_Bethers]
 # a replacement for
 # "broker_service".
 # This entry is an alias to "broker-service". This entry is now
-broker_service 3014/udp        # Broker Service               [Dale_Bethers]                            [Dale_Bethers]                                                                                                                                historic, not usable for use with many common service
+broker_service 3014/udp        # Broker Service               [Dale_Bethers]                            [Dale_Bethers]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 nati-dstp      3015/tcp        # NATI DSTP                    [Paul_Austin]                             [Paul_Austin]
 nati-dstp      3015/udp        # NATI DSTP                    [Paul_Austin]                             [Paul_Austin]
@@ -6911,7 +6911,7 @@ notify-srvr       3016/tcp        # IANA assigned this           [Hugo_Parra]
 # a replacement for
 # "notify_srvr".
 # This entry is an alias to "notify-srvr". This entry is now
-notify_srvr    3016/tcp        # Notify Server                [Hugo_Parra]                              [Hugo_Parra]                                                                                                                                  historic, not usable for use with many common service
+notify_srvr    3016/tcp        # Notify Server                [Hugo_Parra]                              [Hugo_Parra]                                                                                                                                      historic, not usable for use with many common service
 # discovery mechanisms.
 # Notify Server
 # 
@@ -6920,7 +6920,7 @@ notify-srvr       3016/udp        # IANA assigned this           [Hugo_Parra]
 # a replacement for
 # "notify_srvr".
 # This entry is an alias to "notify-srvr". This entry is now
-notify_srvr    3016/udp        # Notify Server                [Hugo_Parra]                              [Hugo_Parra]                                                                                                                                  historic, not usable for use with many common service
+notify_srvr    3016/udp        # Notify Server                [Hugo_Parra]                              [Hugo_Parra]                                                                                                                                      historic, not usable for use with many common service
 # discovery mechanisms.
 # Event Listener
 # 
@@ -6929,7 +6929,7 @@ event-listener    3017/tcp        # IANA assigned this           [Ted_Tronson]
 # a replacement for
 # "event_listener".
 # This entry is an alias to "event-listener". This entry is now
-event_listener 3017/tcp        # Event Listener               [Ted_Tronson]                             [Ted_Tronson]                                                                                                                                 historic, not usable for use with many common service
+event_listener 3017/tcp        # Event Listener               [Ted_Tronson]                             [Ted_Tronson]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # Event Listener
 # 
@@ -6938,7 +6938,7 @@ event-listener    3017/udp        # IANA assigned this           [Ted_Tronson]
 # a replacement for
 # "event_listener".
 # This entry is an alias to "event-listener". This entry is now
-event_listener 3017/udp        # Event Listener               [Ted_Tronson]                             [Ted_Tronson]                                                                                                                                 historic, not usable for use with many common service
+event_listener 3017/udp        # Event Listener               [Ted_Tronson]                             [Ted_Tronson]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # Service Registry
 # 
@@ -6947,7 +6947,7 @@ srvc-registry     3018/tcp        # IANA assigned this           [Mark_Killgore]
 # a replacement for
 # "srvc_registry".
 # This entry is an alias to "srvc-registry". This entry is now
-srvc_registry  3018/tcp        # Service Registry             [Mark_Killgore]                           [Mark_Killgore]                                                                                                                               historic, not usable for use with many common service
+srvc_registry  3018/tcp        # Service Registry             [Mark_Killgore]                           [Mark_Killgore]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # Service Registry
 # 
@@ -6956,7 +6956,7 @@ srvc-registry     3018/udp        # IANA assigned this           [Mark_Killgore]
 # a replacement for
 # "srvc_registry".
 # This entry is an alias to "srvc-registry". This entry is now
-srvc_registry  3018/udp        # Service Registry             [Mark_Killgore]                           [Mark_Killgore]                                                                                                                               historic, not usable for use with many common service
+srvc_registry  3018/udp        # Service Registry             [Mark_Killgore]                           [Mark_Killgore]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # Resource Manager
 # 
@@ -6965,7 +6965,7 @@ resource-mgr      3019/tcp        # IANA assigned this           [Gary_Glover]
 # a replacement for
 # "resource_mgr".
 # This entry is an alias to "resource-mgr". This entry is now
-resource_mgr   3019/tcp        # Resource Manager             [Gary_Glover]                             [Gary_Glover]                                                                                                                                 historic, not usable for use with many common service
+resource_mgr   3019/tcp        # Resource Manager             [Gary_Glover]                             [Gary_Glover]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # Resource Manager
 # 
@@ -6974,7 +6974,7 @@ resource-mgr      3019/udp        # IANA assigned this           [Gary_Glover]
 # a replacement for
 # "resource_mgr".
 # This entry is an alias to "resource-mgr". This entry is now
-resource_mgr   3019/udp        # Resource Manager             [Gary_Glover]                             [Gary_Glover]                                                                                                                                 historic, not usable for use with many common service
+resource_mgr   3019/udp        # Resource Manager             [Gary_Glover]                             [Gary_Glover]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 cifs   3020/tcp        # CIFS                         [Paul_Leach]                              [Paul_Leach]
 cifs   3020/udp        # CIFS                         [Paul_Leach]                              [Paul_Leach]
@@ -6990,7 +6990,7 @@ nds-sso   3024/tcp        # IANA assigned this           [Mel_Oyler]
 # well-formed service name as
 # a replacement for "nds_sso".
 # This entry is an alias to "nds-sso". This entry is now
-nds_sso        3024/tcp        # NDS_SSO                      [Mel_Oyler]                               [Mel_Oyler]                                                                                                                                   historic, not usable for use with many common service
+nds_sso        3024/tcp        # NDS_SSO                      [Mel_Oyler]                               [Mel_Oyler]                                                                                                                                       historic, not usable for use with many common service
 # discovery mechanisms.
 # NDS_SSO
 # 
@@ -6998,7 +6998,7 @@ nds-sso   3024/udp        # IANA assigned this           [Mel_Oyler]
 # well-formed service name as
 # a replacement for "nds_sso".
 # This entry is an alias to "nds-sso". This entry is now
-nds_sso        3024/udp        # NDS_SSO                      [Mel_Oyler]                               [Mel_Oyler]                                                                                                                                   historic, not usable for use with many common service
+nds_sso        3024/udp        # NDS_SSO                      [Mel_Oyler]                               [Mel_Oyler]                                                                                                                                       historic, not usable for use with many common service
 # discovery mechanisms.
 arepa-raft     3025/tcp        # Arepa Raft                   [Stuart_Schaefer]                         [Stuart_Schaefer]
 arepa-raft     3025/udp        # Arepa Raft                   [Stuart_Schaefer]                         [Stuart_Schaefer]
@@ -7011,7 +7011,7 @@ LiebDevMgmt-C     3027/tcp        # IANA assigned this
 # a replacement for
 # "LiebDevMgmt_C".
 # This entry is an alias to "LiebDevMgmt-C". This entry is now
-LiebDevMgmt_C  3027/tcp        # LiebDevMgmt_C                                                                                                                                                                                                        historic, not usable for use with many common service
+LiebDevMgmt_C  3027/tcp        # LiebDevMgmt_C                                                                                                                                                                                                            historic, not usable for use with many common service
 # discovery mechanisms.
 # LiebDevMgmt_C
 # 
@@ -7020,7 +7020,7 @@ LiebDevMgmt-C     3027/udp        # IANA assigned this
 # a replacement for
 # "LiebDevMgmt_C".
 # This entry is an alias to "LiebDevMgmt-C". This entry is now
-LiebDevMgmt_C  3027/udp        # LiebDevMgmt_C                                                                                                                                                                                                        historic, not usable for use with many common service
+LiebDevMgmt_C  3027/udp        # LiebDevMgmt_C                                                                                                                                                                                                            historic, not usable for use with many common service
 # discovery mechanisms.
 # LiebDevMgmt_DM
 # 
@@ -7029,7 +7029,7 @@ LiebDevMgmt-DM    3028/tcp        # IANA assigned this
 # a replacement for
 # "LiebDevMgmt_DM".
 # This entry is an alias to "LiebDevMgmt-DM". This entry is now
-LiebDevMgmt_DM 3028/tcp        # LiebDevMgmt_DM                                                                                                                                                                                                       historic, not usable for use with many common service
+LiebDevMgmt_DM 3028/tcp        # LiebDevMgmt_DM                                                                                                                                                                                                           historic, not usable for use with many common service
 # discovery mechanisms.
 # LiebDevMgmt_DM
 # 
@@ -7038,7 +7038,7 @@ LiebDevMgmt-DM    3028/udp        # IANA assigned this
 # a replacement for
 # "LiebDevMgmt_DM".
 # This entry is an alias to "LiebDevMgmt-DM". This entry is now
-LiebDevMgmt_DM 3028/udp        # LiebDevMgmt_DM                                                                                                                                                                                                       historic, not usable for use with many common service
+LiebDevMgmt_DM 3028/udp        # LiebDevMgmt_DM                                                                                                                                                                                                           historic, not usable for use with many common service
 # discovery mechanisms.
 # LiebDevMgmt_A
 # 
@@ -7047,7 +7047,7 @@ LiebDevMgmt-A     3029/tcp        # IANA assigned this           [Mike_Velten]
 # a replacement for
 # "LiebDevMgmt_A".
 # This entry is an alias to "LiebDevMgmt-A". This entry is now
-LiebDevMgmt_A  3029/tcp        # LiebDevMgmt_A                [Mike_Velten]                             [Mike_Velten]                                                                                                                                 historic, not usable for use with many common service
+LiebDevMgmt_A  3029/tcp        # LiebDevMgmt_A                [Mike_Velten]                             [Mike_Velten]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 # LiebDevMgmt_A
 # 
@@ -7056,7 +7056,7 @@ LiebDevMgmt-A     3029/udp        # IANA assigned this           [Mike_Velten]
 # a replacement for
 # "LiebDevMgmt_A".
 # This entry is an alias to "LiebDevMgmt-A". This entry is now
-LiebDevMgmt_A  3029/udp        # LiebDevMgmt_A                [Mike_Velten]                             [Mike_Velten]                                                                                                                                 historic, not usable for use with many common service
+LiebDevMgmt_A  3029/udp        # LiebDevMgmt_A                [Mike_Velten]                             [Mike_Velten]                                                                                                                                     historic, not usable for use with many common service
 # discovery mechanisms.
 arepa-cas      3030/tcp        # Arepa Cas                    [Stuart_Schaefer]                         [Stuart_Schaefer]
 arepa-cas      3030/udp        # Arepa Cas                    [Stuart_Schaefer]                         [Stuart_Schaefer]
@@ -7108,7 +7108,7 @@ gds-db    3050/tcp        # IANA assigned this           [Madhukar_N_Thakur]
 # well-formed service name as
 # a replacement for "gds_db".
 # This entry is an alias to "gds-db". This entry is now
-gds_db 3050/tcp        # gds_db                       [Madhukar_N_Thakur]                       [Madhukar_N_Thakur]                                                                                                                           historic, not usable for use with many common service
+gds_db 3050/tcp        # gds_db                       [Madhukar_N_Thakur]                       [Madhukar_N_Thakur]                                                                                                                               historic, not usable for use with many common service
 # discovery mechanisms.
 # gds_db
 # 
@@ -7116,7 +7116,7 @@ gds-db    3050/udp        # IANA assigned this           [Madhukar_N_Thakur]
 # well-formed service name as
 # a replacement for "gds_db".
 # This entry is an alias to "gds-db". This entry is now
-gds_db 3050/udp        # gds_db                       [Madhukar_N_Thakur]                       [Madhukar_N_Thakur]                                                                                                                           historic, not usable for use with many common service
+gds_db 3050/udp        # gds_db                       [Madhukar_N_Thakur]                       [Madhukar_N_Thakur]                                                                                                                               historic, not usable for use with many common service
 # discovery mechanisms.
 galaxy-server  3051/tcp        # Galaxy Server                [Michael_Andre]                           [Michael_Andre]
 galaxy-server  3051/udp        # Galaxy Server                [Michael_Andre]                           [Michael_Andre]
@@ -7183,7 +7183,7 @@ stm-pproc 3080/tcp        # IANA assigned this           [Paul_McGinnis]
 # a replacement for
 # "stm_pproc".
 # This entry is an alias to "stm-pproc". This entry is now
-stm_pproc      3080/tcp        # stm_pproc                    [Paul_McGinnis]                           [Paul_McGinnis]                                                                                                                               historic, not usable for use with many common service
+stm_pproc      3080/tcp        # stm_pproc                    [Paul_McGinnis]                           [Paul_McGinnis]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # stm_pproc
 # 
@@ -7192,7 +7192,7 @@ stm-pproc 3080/udp        # IANA assigned this           [Paul_McGinnis]
 # a replacement for
 # "stm_pproc".
 # This entry is an alias to "stm-pproc". This entry is now
-stm_pproc      3080/udp        # stm_pproc                    [Paul_McGinnis]                           [Paul_McGinnis]                                                                                                                               historic, not usable for use with many common service
+stm_pproc      3080/udp        # stm_pproc                    [Paul_McGinnis]                           [Paul_McGinnis]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 tl1-lv 3081/tcp        # TL1-LV
 tl1-lv 3081/udp        # TL1-LV
@@ -7325,11 +7325,11 @@ seaview 3143/udp        # Sea View                     [Jim_Flaherty_2]
 tarantella     3144/tcp        # Tarantella                   [Roger_Binns]                             [Roger_Binns]
 tarantella     3144/udp        # Tarantella                   [Roger_Binns]                             [Roger_Binns]
 # UNAUTHORIZED
-csi-lfap       3145/tcp        # CSI-LFAP                     [Paul_Amsden]                             [Paul_Amsden]                                                                                                                    USE: port
+csi-lfap       3145/tcp        # CSI-LFAP                     [Paul_Amsden]                             [Paul_Amsden]                                                                                                                        USE: port
 # 3145 by
 # zftpserver
 # UNAUTHORIZED
-csi-lfap       3145/udp        # CSI-LFAP                     [Paul_Amsden]                             [Paul_Amsden]                                                                                                                    USE: port
+csi-lfap       3145/udp        # CSI-LFAP                     [Paul_Amsden]                             [Paul_Amsden]                                                                                                                        USE: port
 # 3145 by
 # zftpserver
 bears-02       3146/tcp        # bears-02                     [Bruce_McKinnon_2]                        [Bruce_McKinnon_2]
@@ -7669,7 +7669,7 @@ deskview  3298/udp        # DeskView                     [Manfred_Randelzofer]
 pdrncs 3299/tcp        # pdrncs                       [Paul_Wissenbach]                         [Paul_Wissenbach]
 pdrncs 3299/udp        # pdrncs                       [Paul_Wissenbach]                         [Paul_Wissenbach]
 # 3300-3301
-# 3300-3301            unassigned                                                                                                                                                                                              Unauthorized
+# 3300-3301            unassigned                                                                                                                                                                                                  Unauthorized
 # Use by SAP
 # R/3
 mcs-fastmail   3302/tcp        # MCS Fastmail                 [Patti_Jo_Newsom]                         [Patti_Jo_Newsom]
@@ -7867,7 +7867,7 @@ printer-agent     3396/tcp        # IANA assigned this           [Devon_Taylor]
 # a replacement for
 # "printer_agent".
 # This entry is an alias to "printer-agent". This entry is now
-printer_agent  3396/tcp        # Printer Agent                [Devon_Taylor]                            [Devon_Taylor]                                                                                                                                historic, not usable for use with many common service
+printer_agent  3396/tcp        # Printer Agent                [Devon_Taylor]                            [Devon_Taylor]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 # Printer Agent
 # 
@@ -7876,7 +7876,7 @@ printer-agent     3396/udp        # IANA assigned this           [Devon_Taylor]
 # a replacement for
 # "printer_agent".
 # This entry is an alias to "printer-agent". This entry is now
-printer_agent  3396/udp        # Printer Agent                [Devon_Taylor]                            [Devon_Taylor]                                                                                                                                historic, not usable for use with many common service
+printer_agent  3396/udp        # Printer Agent                [Devon_Taylor]                            [Devon_Taylor]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 cloanto-lm     3397/tcp        # Cloanto License Manager      [Takeo_Sato]                              [Takeo_Sato]                                              2010-04-30
 cloanto-lm     3397/udp        # Cloanto License Manager      [Takeo_Sato]                              [Takeo_Sato]                                              2010-04-30
@@ -8362,8 +8362,8 @@ cs-remote-db      3630/tcp        # C&S Remote Database Port
 cs-remote-db   3630/udp        # C&S Remote Database Port
 cs-services    3631/tcp        # C&S Web Services Port        [Computer_Software_Gm]                    [Computer_Software_Gm]                                    2002-10
 cs-services    3631/udp        # C&S Web Services Port        [Computer_Software_Gm]                    [Computer_Software_Gm]                                    2002-10
-distcc 3632/tcp        # distributed compiler         [Martin_Pool]                             [Martin_Pool]                                             2002-11                                                                             Defined TXT keys: None
-distcc 3632/udp        # distributed compiler         [Martin_Pool]                             [Martin_Pool]                                             2002-11                                                                             Defined TXT keys: None
+distcc 3632/tcp        # distributed compiler         [Martin_Pool]                             [Martin_Pool]                                             2002-11                                                                                 Defined TXT keys: None
+distcc 3632/udp        # distributed compiler         [Martin_Pool]                             [Martin_Pool]                                             2002-11                                                                                 Defined TXT keys: None
 wacp   3633/tcp        # Wyrnix AIS port              [Harry_T_Vennik]                          [Harry_T_Vennik]                                          2002-11
 wacp   3633/udp        # Wyrnix AIS port              [Harry_T_Vennik]                          [Harry_T_Vennik]                                          2002-11
 hlibmgr        3634/tcp        # hNTSP Library Manager        [Kenji_Tetsuyama]                         [Kenji_Tetsuyama]                                         2002-11
@@ -8482,10 +8482,10 @@ simple-push     3687/tcp        # simple-push
 simple-push    3687/udp        # simple-push
 simple-push-s  3688/tcp        # simple-push Secure           [C_Enrique_Ortiz]                         [C_Enrique_Ortiz]                                         2003-01
 simple-push-s  3688/udp        # simple-push Secure           [C_Enrique_Ortiz]                         [C_Enrique_Ortiz]                                         2003-01
-daap   3689/tcp        # Digital Audio Access         [Amandeep_Jawa]                           [Amandeep_Jawa]                                           2003-01                                                                             Defined TXT keys: txtvers, Version, iTSh Version, Machine ID,
-# Protocol (iTunes)                                                                                                                                                                                                    Database ID, Machine Name, Password
-daap   3689/udp        # Digital Audio Access         [Amandeep_Jawa]                           [Amandeep_Jawa]                                           2003-01                                                                             Defined TXT keys: txtvers, Version, iTSh Version, Machine ID,
-# Protocol (iTunes)                                                                                                                                                                                                    Database ID, Machine Name, Password
+daap   3689/tcp        # Digital Audio Access         [Amandeep_Jawa]                           [Amandeep_Jawa]                                           2003-01                                                                                 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID,
+# Protocol (iTunes)                                                                                                                                                                                                        Database ID, Machine Name, Password
+daap   3689/udp        # Digital Audio Access         [Amandeep_Jawa]                           [Amandeep_Jawa]                                           2003-01                                                                                 Defined TXT keys: txtvers, Version, iTSh Version, Machine ID,
+# Protocol (iTunes)                                                                                                                                                                                                        Database ID, Machine Name, Password
 svn    3690/tcp        # Subversion                   [Greg_Hudson_2]                           [Greg_Hudson_2]                                           2003-01
 svn    3690/udp        # Subversion                   [Greg_Hudson_2]                           [Greg_Hudson_2]                                           2003-01
 magaya-network 3691/tcp        # Magaya Network Port          [Jesus_David_Rodrigue]                    [Jesus_David_Rodrigue]                                    2003-02
@@ -8887,7 +8887,7 @@ dl-agent  3876/tcp        # IANA assigned this           [Jason_Lockett][Melanie_Kacerek
 # a replacement for
 # "dl_agent".
 # This entry is an alias to "dl-agent". This entry is now
-dl_agent       3876/tcp        # DirectoryLockdown Agent      [Jason_Lockett][Melanie_Kacerek]          [Jason_Lockett][Melanie_Kacerek]                          2008-12-16                                                                          historic, not usable for use with many common service
+dl_agent       3876/tcp        # DirectoryLockdown Agent      [Jason_Lockett][Melanie_Kacerek]          [Jason_Lockett][Melanie_Kacerek]                          2008-12-16                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # DirectoryLockdown Agent
 # 
@@ -8896,7 +8896,7 @@ dl-agent  3876/udp        # IANA assigned this           [Jason_Lockett][Melanie_Kacerek
 # a replacement for
 # "dl_agent".
 # This entry is an alias to "dl-agent". This entry is now
-dl_agent       3876/udp        # DirectoryLockdown Agent      [Jason_Lockett][Melanie_Kacerek]          [Jason_Lockett][Melanie_Kacerek]                          2008-12-16                                                                          historic, not usable for use with many common service
+dl_agent       3876/udp        # DirectoryLockdown Agent      [Jason_Lockett][Melanie_Kacerek]          [Jason_Lockett][Melanie_Kacerek]                          2008-12-16                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 xmpcr-interface        3877/tcp        # XMPCR Interface Port         [Christopher_Carlson]                     [Christopher_Carlson]                                     2003-10
 xmpcr-interface        3877/udp        # XMPCR Interface Port         [Christopher_Carlson]                     [Christopher_Carlson]                                     2003-10
@@ -8956,7 +8956,7 @@ udt-os    3900/tcp        # IANA assigned this           [James_Powell]
 # well-formed service name as
 # a replacement for "udt_os".
 # This entry is an alias to "udt-os". This entry is now
-udt_os 3900/tcp        # Unidata UDT OS               [James_Powell]                            [James_Powell]                                                                                                                                historic, not usable for use with many common service
+udt_os 3900/tcp        # Unidata UDT OS               [James_Powell]                            [James_Powell]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 # Unidata UDT OS
 # 
@@ -8964,7 +8964,7 @@ udt-os    3900/udp        # IANA assigned this           [James_Powell]
 # well-formed service name as
 # a replacement for "udt_os".
 # This entry is an alias to "udt-os". This entry is now
-udt_os 3900/udp        # Unidata UDT OS               [James_Powell]                            [James_Powell]                                                                                                                                historic, not usable for use with many common service
+udt_os 3900/udp        # Unidata UDT OS               [James_Powell]                            [James_Powell]                                                                                                                                    historic, not usable for use with many common service
 # discovery mechanisms.
 nimsh  3901/tcp        # NIM Service Handler          [Paul_B_Finley]                           [Paul_B_Finley]                                           2003-10
 nimsh  3901/udp        # NIM Service Handler          [Paul_B_Finley]                           [Paul_B_Finley]                                           2003-10
@@ -9049,7 +9049,7 @@ dbcontrol-agent   3938/tcp        # IANA assigned this           [Todd_Guay]
 # a replacement for
 # "dbcontrol_agent".
 # This entry is an alias to "dbcontrol-agent". This entry is
-dbcontrol_agent        3938/tcp        # Oracle dbControl Agent po    [Todd_Guay]                               [Todd_Guay]                                               2003-11                                                                             now historic, not usable for use with many common service
+dbcontrol_agent        3938/tcp        # Oracle dbControl Agent po    [Todd_Guay]                               [Todd_Guay]                                               2003-11                                                                                 now historic, not usable for use with many common service
 # discovery mechanisms.
 # Oracel dbControl Agent po
 # 
@@ -9058,7 +9058,7 @@ dbcontrol-agent   3938/udp        # IANA assigned this           [Todd_Guay]
 # a replacement for
 # "dbcontrol_agent".
 # This entry is an alias to "dbcontrol-agent". This entry is
-dbcontrol_agent        3938/udp        # Oracel dbControl Agent po    [Todd_Guay]                               [Todd_Guay]                                               2003-11                                                                             now historic, not usable for use with many common service
+dbcontrol_agent        3938/udp        # Oracel dbControl Agent po    [Todd_Guay]                               [Todd_Guay]                                               2003-11                                                                                 now historic, not usable for use with many common service
 # discovery mechanisms.
 aamp   3939/tcp        # Anti-virus Application       [In_sik_Choi]                             [In_sik_Choi]                                             2002-02
 # Management Port
@@ -9138,13 +9138,13 @@ landmarks       3969/tcp        # Landmark Messages            [Petri_Rauhala]
 landmarks      3969/udp        # Landmark Messages            [Petri_Rauhala]                           [Petri_Rauhala]                                           2005-08
 # Defined TXT keys:
 # txtvers
-lanrevagent    3970/tcp        # LANrev Agent                 [Martin_Bestmann_3]                       [Martin_Bestmann_3]                                                                                                                           server=<main LANrev server for agent>
+lanrevagent    3970/tcp        # LANrev Agent                 [Martin_Bestmann_3]                       [Martin_Bestmann_3]                                                                                                                               server=<main LANrev server for agent>
 # vers=<version of LANrev Agent>
 # build=<build number of LANrev Agent>
 # id=<agent identifier>
 # Defined TXT keys:
 # txtvers
-lanrevagent    3970/udp        # LANrev Agent                 [Martin_Bestmann_3]                       [Martin_Bestmann_3]                                                                                                                           server=<main LANrev server for agent>
+lanrevagent    3970/udp        # LANrev Agent                 [Martin_Bestmann_3]                       [Martin_Bestmann_3]                                                                                                                               server=<main LANrev server for agent>
 # vers=<version of LANrev Agent>
 # build=<build number of LANrev Agent>
 # id=<agent identifier>
@@ -9191,7 +9191,7 @@ mapper-ws-ethd    3986/tcp        # IANA assigned this           [John_C_Horton]
 # a replacement for
 # "mapper-ws_ethd".
 # This entry is an alias to "mapper-ws-ethd". This entry is now
-mapper-ws_ethd 3986/tcp        # MAPPER workstation server    [John_C_Horton]                           [John_C_Horton]                                                                                                                               historic, not usable for use with many common service
+mapper-ws_ethd 3986/tcp        # MAPPER workstation server    [John_C_Horton]                           [John_C_Horton]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 # MAPPER workstation server
 # 
@@ -9200,7 +9200,7 @@ mapper-ws-ethd    3986/udp        # IANA assigned this           [John_C_Horton]
 # a replacement for
 # "mapper-ws_ethd".
 # This entry is an alias to "mapper-ws-ethd". This entry is now
-mapper-ws_ethd 3986/udp        # MAPPER workstation server    [John_C_Horton]                           [John_C_Horton]                                                                                                                               historic, not usable for use with many common service
+mapper-ws_ethd 3986/udp        # MAPPER workstation server    [John_C_Horton]                           [John_C_Horton]                                                                                                                                   historic, not usable for use with many common service
 # discovery mechanisms.
 centerline     3987/tcp        # Centerline                   [Mark_Simpson]                            [Mark_Simpson]
 centerline     3987/udp        # Centerline                   [Mark_Simpson]                            [Mark_Simpson]
@@ -9231,9 +9231,9 @@ nvcnet    3999/tcp        # Norman distributes scanning  [Kristian_A_Bognaes]
 # service
 nvcnet 3999/udp        # Norman distributes scanning  [Kristian_A_Bognaes]                      [Kristian_A_Bognaes]                                      2007-11-06
 # service
-terabase       4000/tcp        # Terabase                     [Thor_Olson]                              [Thor_Olson]                                                                                                                                  Potential Conflict of ports PORT 4000 also used by ICQ
+terabase       4000/tcp        # Terabase                     [Thor_Olson]                              [Thor_Olson]                                                                                                                                      Potential Conflict of ports PORT 4000 also used by ICQ
 # <www.icq.com>
-terabase       4000/udp        # Terabase                     [Thor_Olson]                              [Thor_Olson]                                                                                                                                  Potential Conflict of ports PORT 4000 also used by ICQ
+terabase       4000/udp        # Terabase                     [Thor_Olson]                              [Thor_Olson]                                                                                                                                      Potential Conflict of ports PORT 4000 also used by ICQ
 # <www.icq.com>
 newoak 4001/tcp        # NewOak                       [Jim_Philippou]                           [Jim_Philippou]
 newoak 4001/udp        # NewOak                       [Jim_Philippou]                           [Jim_Philippou]
@@ -9328,11 +9328,11 @@ nirp    4043/udp        # Neighbour Identity
 ltp    4044/tcp        # Location Tracking Protocol
 ltp    4044/udp        # Location Tracking Protocol
 # UNAUTHORIZED
-npp    4045/tcp        # Network Paging Protocol                                                                                                                                                                                 USE: Port
+npp    4045/tcp        # Network Paging Protocol                                                                                                                                                                                     USE: Port
 # 4045 used by
 # NFS
 # UNAUTHORIZED
-npp    4045/udp        # Network Paging Protocol                                                                                                                                                                                 USE: Port
+npp    4045/udp        # Network Paging Protocol                                                                                                                                                                                     USE: Port
 # 4045 used by
 # NFS
 acp-proto      4046/tcp        # Accounting Protocol
@@ -9377,8 +9377,8 @@ dsmeter-iatc      4060/tcp        # IANA assigned this           [John_McCann]
 # well-formed service name as
 # a replacement for
 # "dsmeter_iatc".
-# DSMETER Inter-Agent Transfer                                                                                                                                                                                         This entry is an alias to "dsmeter-iatc". This entry is now
-dsmeter_iatc   4060/tcp        # Channel                      [John_McCann]                             [John_McCann]                                             2006-12                                                                             historic, not usable for use with many common service
+# DSMETER Inter-Agent Transfer                                                                                                                                                                                             This entry is an alias to "dsmeter-iatc". This entry is now
+dsmeter_iatc   4060/tcp        # Channel                      [John_McCann]                             [John_McCann]                                             2006-12                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # DSMETER Inter-Agent Transfer
 # Channel
@@ -9387,8 +9387,8 @@ dsmeter-iatc      4060/udp        # IANA assigned this           [John_McCann]
 # well-formed service name as
 # a replacement for
 # "dsmeter_iatc".
-# DSMETER Inter-Agent Transfer                                                                                                                                                                                         This entry is an alias to "dsmeter-iatc". This entry is now
-dsmeter_iatc   4060/udp        # Channel                      [John_McCann]                             [John_McCann]                                             2006-12                                                                             historic, not usable for use with many common service
+# DSMETER Inter-Agent Transfer                                                                                                                                                                                             This entry is an alias to "dsmeter-iatc". This entry is now
+dsmeter_iatc   4060/udp        # Channel                      [John_McCann]                             [John_McCann]                                             2006-12                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 ice-location   4061/tcp        # Ice Location Service (TCP)
 ice-location   4061/udp        # Ice Location Service (TCP)
@@ -9409,7 +9409,7 @@ avanti-cdp        4065/tcp        # IANA assigned this           [Steve_Meyer_Sr]
 # a replacement for
 # "avanti_cdp".
 # This entry is an alias to "avanti-cdp". This entry is now
-avanti_cdp     4065/tcp        # Avanti Common Data           [Steve_Meyer_Sr]                          [Steve_Meyer_Sr]                                          2007-02                                                                             historic, not usable for use with many common service
+avanti_cdp     4065/tcp        # Avanti Common Data           [Steve_Meyer_Sr]                          [Steve_Meyer_Sr]                                          2007-02                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # Avanti Common Data
 # 
@@ -9418,7 +9418,7 @@ avanti-cdp        4065/udp        # IANA assigned this           [Steve_Meyer_Sr]
 # a replacement for
 # "avanti_cdp".
 # This entry is an alias to "avanti-cdp". This entry is now
-avanti_cdp     4065/udp        # Avanti Common Data           [Steve_Meyer_Sr]                          [Steve_Meyer_Sr]                                          2007-02                                                                             historic, not usable for use with many common service
+avanti_cdp     4065/udp        # Avanti Common Data           [Steve_Meyer_Sr]                          [Steve_Meyer_Sr]                                          2007-02                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 pmas   4066/tcp        # Performance Measurement and  [Zenon_Fortuna]                           [Zenon_Fortuna]                                           2007-02
 # Analysis
@@ -9590,7 +9590,7 @@ nuts-dem  4132/tcp        # IANA assigned this
 # a replacement for
 # "nuts_dem".
 # This entry is an alias to "nuts-dem". This entry is now
-nuts_dem       4132/tcp        # NUTS Daemon                                                                                                                                                                                                          historic, not usable for use with many common service
+nuts_dem       4132/tcp        # NUTS Daemon                                                                                                                                                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # NUTS Daemon
 # 
@@ -9599,7 +9599,7 @@ nuts-dem  4132/udp        # IANA assigned this
 # a replacement for
 # "nuts_dem".
 # This entry is an alias to "nuts-dem". This entry is now
-nuts_dem       4132/udp        # NUTS Daemon                                                                                                                                                                                                          historic, not usable for use with many common service
+nuts_dem       4132/udp        # NUTS Daemon                                                                                                                                                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # NUTS Bootp Server
 # 
@@ -9608,7 +9608,7 @@ nuts-bootp        4133/tcp        # IANA assigned this           [Martin_Freiss_2]
 # a replacement for
 # "nuts_bootp".
 # This entry is an alias to "nuts-bootp". This entry is now
-nuts_bootp     4133/tcp        # NUTS Bootp Server            [Martin_Freiss_2]                         [Martin_Freiss_2]                                                                                                                             historic, not usable for use with many common service
+nuts_bootp     4133/tcp        # NUTS Bootp Server            [Martin_Freiss_2]                         [Martin_Freiss_2]                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # NUTS Bootp Server
 # 
@@ -9617,7 +9617,7 @@ nuts-bootp        4133/udp        # IANA assigned this           [Martin_Freiss_2]
 # a replacement for
 # "nuts_bootp".
 # This entry is an alias to "nuts-bootp". This entry is now
-nuts_bootp     4133/udp        # NUTS Bootp Server            [Martin_Freiss_2]                         [Martin_Freiss_2]                                                                                                                             historic, not usable for use with many common service
+nuts_bootp     4133/udp        # NUTS Bootp Server            [Martin_Freiss_2]                         [Martin_Freiss_2]                                                                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 nifty-hmi      4134/tcp        # NIFTY-Serve HMI protocol     [Ryuichi_Suzuki]                          [Ryuichi_Suzuki]
 nifty-hmi      4134/udp        # NIFTY-Serve HMI protocol     [Ryuichi_Suzuki]                          [Ryuichi_Suzuki]
@@ -9644,8 +9644,8 @@ cedros-fds        4140/tcp        # IANA assigned this           [Markus_Michels_3]
 # well-formed service name as
 # a replacement for
 # "cedros_fds".
-# Cedros Fraud Detection                                                                                                                                                                                               This entry is an alias to "cedros-fds". This entry is now
-cedros_fds     4140/tcp        # System                       [Markus_Michels_3]                        [Markus_Michels_3]                                        2006-10                                                                             historic, not usable for use with many common service
+# Cedros Fraud Detection                                                                                                                                                                                                   This entry is an alias to "cedros-fds". This entry is now
+cedros_fds     4140/tcp        # System                       [Markus_Michels_3]                        [Markus_Michels_3]                                        2006-10                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # Cedros Fraud Detection
 # System
@@ -9654,8 +9654,8 @@ cedros-fds        4140/udp        # IANA assigned this           [Markus_Michels_3]
 # well-formed service name as
 # a replacement for
 # "cedros_fds".
-# Cedros Fraud Detection                                                                                                                                                                                               This entry is an alias to "cedros-fds". This entry is now
-cedros_fds     4140/udp        # System                       [Markus_Michels_3]                        [Markus_Michels_3]                                        2006-10                                                                             historic, not usable for use with many common service
+# Cedros Fraud Detection                                                                                                                                                                                                   This entry is an alias to "cedros-fds". This entry is now
+cedros_fds     4140/udp        # System                       [Markus_Michels_3]                        [Markus_Michels_3]                                        2006-10                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 oirtgsvc       4141/tcp        # Workflow Server
 oirtgsvc       4141/udp        # Workflow Server
@@ -9663,7 +9663,7 @@ oidocsvc  4142/tcp        # Document Server
 oidocsvc       4142/udp        # Document Server
 oidsr  4143/tcp        # Document Replication         [Norman_Brie]                             [Norman_Brie]
 oidsr  4143/udp        # Document Replication         [Norman_Brie]                             [Norman_Brie]
-# 4144               Unassigned                                                                                                                                                                                                           Compuserve (unoffically) is using port 4144
+# 4144               Unassigned                                                                                                                                                                                                               Compuserve (unoffically) is using port 4144
 vvr-control    4145/tcp        # VVR Control                  [Ming_Xu]                                 [Ming_Xu]
 vvr-control    4145/udp        # VVR Control                  [Ming_Xu]                                 [Ming_Xu]
 tgcconnect     4146/tcp        # TGCConnect Beacon            [Brian_Becker]                            [Brian_Becker]                                            2006-10
@@ -9685,7 +9685,7 @@ menandmice-noh    4151/tcp        # IANA assigned this           [Eggert_Thorlacius]
 # a replacement for
 # "menandmice_noh".
 # This entry is an alias to "menandmice-noh". This entry is now
-menandmice_noh 4151/tcp        # Men & Mice Remote Control    [Eggert_Thorlacius]                       [Eggert_Thorlacius]                                       2007-08-30                                                                          historic, not usable for use with many common service
+menandmice_noh 4151/tcp        # Men & Mice Remote Control    [Eggert_Thorlacius]                       [Eggert_Thorlacius]                                       2007-08-30                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # Men & Mice Remote Control
 # 
@@ -9694,7 +9694,7 @@ menandmice-noh    4151/udp        # IANA assigned this           [Eggert_Thorlacius]
 # a replacement for
 # "menandmice_noh".
 # This entry is an alias to "menandmice-noh". This entry is now
-menandmice_noh 4151/udp        # Men & Mice Remote Control    [Eggert_Thorlacius]                       [Eggert_Thorlacius]                                       2007-08-30                                                                          historic, not usable for use with many common service
+menandmice_noh 4151/udp        # Men & Mice Remote Control    [Eggert_Thorlacius]                       [Eggert_Thorlacius]                                       2007-08-30                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # iDigTech Multiplex
 # 
@@ -9703,7 +9703,7 @@ idig-mux  4152/tcp        # IANA assigned this           [Robin_Findley]
 # a replacement for
 # "idig_mux".
 # This entry is an alias to "idig-mux". This entry is now
-idig_mux       4152/tcp        # iDigTech Multiplex           [Robin_Findley]                           [Robin_Findley]                                           2007-05                                                                             historic, not usable for use with many common service
+idig_mux       4152/tcp        # iDigTech Multiplex           [Robin_Findley]                           [Robin_Findley]                                           2007-05                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 # iDigTech Multiplex
 # 
@@ -9712,7 +9712,7 @@ idig-mux  4152/udp        # IANA assigned this           [Robin_Findley]
 # a replacement for
 # "idig_mux".
 # This entry is an alias to "idig-mux". This entry is now
-idig_mux       4152/udp        # iDigTech Multiplex           [Robin_Findley]                           [Robin_Findley]                                           2007-05                                                                             historic, not usable for use with many common service
+idig_mux       4152/udp        # iDigTech Multiplex           [Robin_Findley]                           [Robin_Findley]                                           2007-05                                                                                 historic, not usable for use with many common service
 # discovery mechanisms.
 mbl-battd      4153/tcp        # MBL Remote Battery           [Claudio_Procida]                         [Claudio_Procida]                                         2007-05
 # Monitoring
@@ -9799,8 +9799,8 @@ universe-suite    4184/tcp        # IANA assigned this           [Gary_ANDREWS]
 # well-formed service name as
 # a replacement for
 # "universe_suite".
-# UNIVERSE SUITE MESSAGE                                                                                                                                                                                               This entry is an alias to "universe-suite". This entry is now
-universe_suite 4184/tcp        # SERVICE                      [Gary_ANDREWS]                            [Gary_ANDREWS]                                            2008-01-07                                                                          historic, not usable for use with many common service
+# UNIVERSE SUITE MESSAGE                                                                                                                                                                                                   This entry is an alias to "universe-suite". This entry is now
+universe_suite 4184/tcp        # SERVICE                      [Gary_ANDREWS]                            [Gary_ANDREWS]                                            2008-01-07                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # UNIVERSE SUITE MESSAGE
 # SERVICE
@@ -9809,8 +9809,8 @@ universe-suite    4184/udp        # IANA assigned this           [Gary_ANDREWS]
 # well-formed service name as
 # a replacement for
 # "universe_suite".
-# UNIVERSE SUITE MESSAGE                                                                                                                                                                                               This entry is an alias to "universe-suite". This entry is now
-universe_suite 4184/udp        # SERVICE                      [Gary_ANDREWS]                            [Gary_ANDREWS]                                            2008-01-07                                                                          historic, not usable for use with many common service
+# UNIVERSE SUITE MESSAGE                                                                                                                                                                                                   This entry is an alias to "universe-suite". This entry is now
+universe_suite 4184/udp        # SERVICE                      [Gary_ANDREWS]                            [Gary_ANDREWS]                                            2008-01-07                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 wcpp   4185/tcp        # Woven Control Plane Protocol [Christopher_LILJENST]                    [Christopher_LILJENST]                                    2008-04-14
 wcpp   4185/udp        # Woven Control Plane Protocol [Christopher_LILJENST]                    [Christopher_LILJENST]                                    2008-04-14
@@ -9823,7 +9823,7 @@ csc-proxy 4187/tcp        # IANA assigned this           [Matt_Craighead]
 # a replacement for
 # "csc_proxy".
 # This entry is an alias to "csc-proxy". This entry is now
-csc_proxy      4187/tcp        # Cascade Proxy                [Matt_Craighead]                          [Matt_Craighead]                                          2008-09-11                                                                          historic, not usable for use with many common service
+csc_proxy      4187/tcp        # Cascade Proxy                [Matt_Craighead]                          [Matt_Craighead]                                          2008-09-11                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # 4187        udp    Reserved
 vatata 4188/tcp        # Vatata Peer to Peer Protocol [Song_Jian]                               [Song_Jian]                                               2008-09-15
@@ -9854,8 +9854,8 @@ srcp      4303/tcp        # Simple Railroad Command      [Matthias_Trute]
 # Protocol
 srcp   4303/udp        # Simple Railroad Command      [Matthias_Trute]                          [Matthias_Trute]                                          2007-01
 # Protocol
-owserver       4304/tcp        # One-Wire Filesystem Server   [Paul_Alfille]                            [Paul_Alfille]                                            2007-01                                                                             Defined TXT keys: txtvers
-owserver       4304/udp        # One-Wire Filesystem Server   [Paul_Alfille]                            [Paul_Alfille]                                            2007-01                                                                             Defined TXT keys: txtvers
+owserver       4304/tcp        # One-Wire Filesystem Server   [Paul_Alfille]                            [Paul_Alfille]                                            2007-01                                                                                 Defined TXT keys: txtvers
+owserver       4304/udp        # One-Wire Filesystem Server   [Paul_Alfille]                            [Paul_Alfille]                                            2007-01                                                                                 Defined TXT keys: txtvers
 batman 4305/tcp        # better approach to mobile    [Simon_Wunderlich]                        [Simon_Wunderlich]                                        2007-08-30
 # ad-hoc networking
 batman 4305/udp        # better approach to mobile    [Simon_Wunderlich]                        [Simon_Wunderlich]                                        2007-08-30
@@ -9958,8 +9958,8 @@ matrix-vnet       4360/tcp        # IANA assigned this           [Rehan_Mahmood]
 # well-formed service name as
 # a replacement for
 # "matrix_vnet".
-# Matrix VNet Communication                                                                                                                                                                                            This entry is an alias to "matrix-vnet". This entry is now
-matrix_vnet    4360/tcp        # Protocol                     [Rehan_Mahmood]                           [Rehan_Mahmood]                                           2009-03-18                                                                          historic, not usable for use with many common service
+# Matrix VNet Communication                                                                                                                                                                                                This entry is an alias to "matrix-vnet". This entry is now
+matrix_vnet    4360/tcp        # Protocol                     [Rehan_Mahmood]                           [Rehan_Mahmood]                                           2009-03-18                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # 4360        udp    Reserved
 # 4361        tcp    Reserved
@@ -9980,7 +9980,7 @@ elpro-tunnel      4370/tcp        # IANA assigned this           [Harry_Courtice]
 # a replacement for
 # "elpro_tunnel".
 # This entry is an alias to "elpro-tunnel". This entry is now
-elpro_tunnel   4370/tcp        # ELPRO V2 Protocol Tunnel     [Harry_Courtice]                          [Harry_Courtice]                                          2008-04-14                                                                          historic, not usable for use with many common service
+elpro_tunnel   4370/tcp        # ELPRO V2 Protocol Tunnel     [Harry_Courtice]                          [Harry_Courtice]                                          2008-04-14                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # ELPRO V2 Protocol Tunnel
 # 
@@ -9989,11 +9989,11 @@ elpro-tunnel    4370/udp        # IANA assigned this           [Harry_Courtice]
 # a replacement for
 # "elpro_tunnel".
 # This entry is an alias to "elpro-tunnel". This entry is now
-elpro_tunnel   4370/udp        # ELPRO V2 Protocol Tunnel     [Harry_Courtice]                          [Harry_Courtice]                                          2008-04-14                                                                          historic, not usable for use with many common service
+elpro_tunnel   4370/udp        # ELPRO V2 Protocol Tunnel     [Harry_Courtice]                          [Harry_Courtice]                                          2008-04-14                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
-l2c-control    4371/tcp        # LAN2CAN Control              [Phil_Tolson]                             [Phil_Tolson]                                             2008-07-07                                                                          Modified: 21 January 2010
+l2c-control    4371/tcp        # LAN2CAN Control              [Phil_Tolson]                             [Phil_Tolson]                                             2008-07-07                                                                              Modified: 21 January 2010
 l2c-disc       4371/udp        # LAN2CAN Discovery            [Phil_Tolson]                             [Phil_Tolson]                                             2010-01-21
-l2c-data       4372/tcp        # LAN2CAN Data                 [Phil_Tolson]                             [Phil_Tolson]                                             2008-07-07                                                                          Modified: 21 January 2010
+l2c-data       4372/tcp        # LAN2CAN Data                 [Phil_Tolson]                             [Phil_Tolson]                                             2008-07-07                                                                              Modified: 21 January 2010
 l2c-data       4372/udp        # LAN2CAN Data                 [Phil_Tolson]                             [Phil_Tolson]                                             2010-01-21
 remctl 4373/tcp        # Remote Authenticated Command [Russ_Allbery]                            [Russ_Allbery]                                            2007-08-30
 # Service
@@ -10103,25 +10103,25 @@ pharos        4443/tcp        # Pharos                       [TeleConsult]
 pharos 4443/udp        # Pharos                       [TeleConsult]                             [TeleConsult]
 # krb524
 # assigned the
-krb524 4444/tcp        # KRB524                       [B_Clifford_Neuman]                       [B_Clifford_Neuman]                                                                                                              port, nv
+krb524 4444/tcp        # KRB524                       [B_Clifford_Neuman]                       [B_Clifford_Neuman]                                                                                                                  port, nv
 # used it
 # without an
 # assignment
 # krb524
 # assigned the
-krb524 4444/udp        # KRB524                       [B_Clifford_Neuman]                       [B_Clifford_Neuman]                                                                                                              port, nv
+krb524 4444/udp        # KRB524                       [B_Clifford_Neuman]                       [B_Clifford_Neuman]                                                                                                                  port, nv
 # used it
 # without an
 # assignment
 # krb524
 # assigned the
-nv-video       4444/tcp        # NV Video default             [Ron_Frederick]                           [Ron_Frederick]                                                                                                                  port, nv
+nv-video       4444/tcp        # NV Video default             [Ron_Frederick]                           [Ron_Frederick]                                                                                                                      port, nv
 # used it
 # without an
 # assignment
 # krb524
 # assigned the
-nv-video       4444/udp        # NV Video default             [Ron_Frederick]                           [Ron_Frederick]                                                                                                                  port, nv
+nv-video       4444/udp        # NV Video default             [Ron_Frederick]                           [Ron_Frederick]                                                                                                                      port, nv
 # used it
 # without an
 # assignment
@@ -10177,7 +10177,7 @@ awacs-ice       4488/udp        # Apple Wide Area Connectivity [Rory_McGuire]
 # 4489-4499            Unassigned
 ipsec-nat-t    4500/tcp        # IPsec NAT-Traversal                                                                                                                                        [RFC3947]
 ipsec-nat-t    4500/udp        # IPsec NAT-Traversal                                                                                                                                        [RFC3947]
-# 4501               Unassigned                   [IANA]                                    [IANA]                                                                                                                                        De-registered 08 June 2001
+# 4501               Unassigned                   [IANA]                                    [IANA]                                                                                                                                            De-registered 08 June 2001
 # 4502-4534            Unassigned
 ehs    4535/tcp        # Event Heap Server
 ehs    4535/udp        # Event Heap Server
@@ -10240,7 +10240,7 @@ bmc-reporting   4568/udp        # BMC Reporting                [Portnoy_Boxman]
 # domain any DNS domain name or IP address
 # extension alphanumeric, additionally '*', '#', '_', '+', '-'
 # context alphanumeric, additionally '_', '+', '-'
-iax    4569/tcp        # Inter-Asterisk eXchange      [Benjamin_Kowarsch]                       [Benjamin_Kowarsch]                                                                 [RFC5456]                                                 trunk yes | no | 0 | 1
+iax    4569/tcp        # Inter-Asterisk eXchange      [Benjamin_Kowarsch]                       [Benjamin_Kowarsch]                                                                 [RFC5456]                                                     trunk yes | no | 0 | 1
 # welcome alphanumeric, additionally '*', '#', '_', '+', '-'
 # voicemail alphanumeric, additionally '*', '#', '_', '+', '-'
 # reception alphanumeric, additionally '*', '#', '_', '+', '-'
@@ -10255,7 +10255,7 @@ iax     4569/tcp        # Inter-Asterisk eXchange      [Benjamin_Kowarsch]
 # domain any DNS domain name or IP address
 # extension alphanumeric, additionally '*', '#', '_', '+', '-'
 # context alphanumeric, additionally '_', '+', '-'
-iax    4569/udp        # Inter-Asterisk eXchange      [Benjamin_Kowarsch]                       [Benjamin_Kowarsch]                                                                 [RFC5456]                                                 trunk yes | no | 0 | 1
+iax    4569/udp        # Inter-Asterisk eXchange      [Benjamin_Kowarsch]                       [Benjamin_Kowarsch]                                                                 [RFC5456]                                                     trunk yes | no | 0 | 1
 # welcome alphanumeric, additionally '*', '#', '_', '+', '-'
 # voicemail alphanumeric, additionally '*', '#', '_', '+', '-'
 # reception alphanumeric, additionally '*', '#', '_', '+', '-'
@@ -10456,8 +10456,8 @@ smart-install   4786/tcp        # Smart Install Service        [Amit_Nigam]
 sia-ctrl-plane 4787/tcp        # Architecture (SIA)           [Shree_Murthy]                            [Shree_Murthy]                                            2009-10-29
 # Control-Plane
 # 4787        udp    Reserved
-# eXtensible Messaging Client                                                                                                                                                                                          Defined TXT keys: txtvers=1 (as described in the draft)
-xmcp   4788/tcp        # Protocol                     [Cisco]                                   [Glenn_Matthews]                                          2011-05-23   2011-10-25                                                             protovers=<comma-separated list of major/minor versions
+# eXtensible Messaging Client                                                                                                                                                                                              Defined TXT keys: txtvers=1 (as described in the draft)
+xmcp   4788/tcp        # Protocol                     [Cisco]                                   [Glenn_Matthews]                                          2011-05-23   2011-10-25                                                                 protovers=<comma-separated list of major/minor versions
 # supported> (examples: "protovers=1.0" "protovers=1.1,2.0"
 # 4788        udp    Reserved
 # 4789-4799            Unassigned
@@ -10513,7 +10513,7 @@ contamac-icm    4846/tcp        # IANA assigned this           [Abdullah_Obeid]
 # a replacement for
 # "contamac_icm".
 # This entry is an alias to "contamac-icm". This entry is now
-contamac_icm   4846/tcp        # Contamac ICM Service         [Abdullah_Obeid]                          [Abdullah_Obeid]                                          2008-03-20                                                                          historic, not usable for use with many common service
+contamac_icm   4846/tcp        # Contamac ICM Service         [Abdullah_Obeid]                          [Abdullah_Obeid]                                          2008-03-20                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # Contamac ICM Service
 # 
@@ -10522,7 +10522,7 @@ contamac-icm    4846/udp        # IANA assigned this           [Abdullah_Obeid]
 # a replacement for
 # "contamac_icm".
 # This entry is an alias to "contamac-icm". This entry is now
-contamac_icm   4846/udp        # Contamac ICM Service         [Abdullah_Obeid]                          [Abdullah_Obeid]                                          2008-03-20                                                                          historic, not usable for use with many common service
+contamac_icm   4846/udp        # Contamac ICM Service         [Abdullah_Obeid]                          [Abdullah_Obeid]                                          2008-03-20                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 wfc    4847/tcp        # Web Fresh Communication      [Jonathan_Bastnagel]                      [Jonathan_Bastnagel]                                      2007-09-17
 wfc    4847/udp        # Web Fresh Communication      [Jonathan_Bastnagel]                      [Jonathan_Bastnagel]                                      2007-09-17
@@ -10591,8 +10591,8 @@ flr-agent       4901/tcp        # IANA assigned this           [David_Vest]
 # well-formed service name as
 # a replacement for
 # "flr_agent".
-# FileLocator Remote Search                                                                                                                                                                                            This entry is an alias to "flr-agent". This entry is now
-flr_agent      4901/tcp        # Agent                        [David_Vest]                              [David_Vest]                                              2008-11-19                                                                          historic, not usable for use with many common service
+# FileLocator Remote Search                                                                                                                                                                                                This entry is an alias to "flr-agent". This entry is now
+flr_agent      4901/tcp        # Agent                        [David_Vest]                              [David_Vest]                                              2008-11-19                                                                              historic, not usable for use with many common service
 # discovery mechanisms.
 # 4901        udp    Reserved
 magiccontrol   4902/tcp        # magicCONROL RF and Data      [Andreas_Spalenski]                       [Andreas_Spalenski]                                       2008-11-24
@@ -10631,7 +10631,7 @@ sagxtsds        4952/udp        # SAG Directory Server         [Michael_Chirila]
 dbsyncarbiter  4953/tcp        # Synchronization Arbiter      [Dave_Neudoerffer_2]                      [Dave_Neudoerffer_2]                                      2009-11-18
 # 4953        udp    Reserved
 # UNAUTHORIZED
-# 4954-4968            Unassigned                                                                                                                                                                                              USE: port
+# 4954-4968            Unassigned                                                                                                                                                                                                  USE: port
 # 4967 by
 # Rockwell FTA
 ccss-qmm       4969/tcp        # CCSS QMessageMonitor
@@ -10654,9 +10654,9 @@ smar-se-port2   4988/tcp        # SMAR Ethernet Port 2         [Delcio_Prizon]