update from debian netbase 4.40 package

2 files changed, 437 insertions, 528 deletions

diff --git a/protocols b/protocols
index 12272c4..a79cd35 100644
--- a/protocols
+++ b/protocols
@@ -1,148 +1,61 @@
-# /etc/protocols:
-# $Id: protocols 105621 2001-05-02 17:10:04Z chmouel $
+# $Id$
 #
 # Internet (IP) protocols
 #
-#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
-#
-# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
-#
-# See also http://www.isi.edu/in-notes/iana/assignments/protocol-numbers
+# Updated from http://www.iana.org/assignments/protocol-numbers and other
+# sources.
+# New protocols will be added on request if they have been officially
+# assigned by IANA and are not historical.
+# If you need a huge list of used numbers please install the nmap package.
 
 ip	0	IP		# internet protocol, pseudo protocol number
-#hopopt	0	HOPOPT		# hop-by-hop options for ipv6
+#hopopt	0	HOPOPT		# IPv6 Hop-by-Hop Option [RFC1883]
 icmp	1	ICMP		# internet control message protocol
-igmp	2	IGMP		# internet group management protocol
+igmp	2	IGMP		# Internet Group Management
 ggp	3	GGP		# gateway-gateway protocol
 ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
 st	5	ST		# ST datagram mode
 tcp	6	TCP		# transmission control protocol
-cbt	7	CBT		# CBT, Tony Ballardie <A.Ballardie@cs.ucl.ac.uk>
 egp	8	EGP		# exterior gateway protocol
-igp	9	IGP		# any private interior gateway (Cisco: for IGRP)
-bbn-rcc	10	BBN-RCC-MON	# BBN RCC Monitoring
-nvp	11	NVP-II		# Network Voice Protocol
+igp	9	IGP		# any private interior gateway (Cisco)
 pup	12	PUP		# PARC universal packet protocol
-argus	13	ARGUS		# ARGUS
-emcon	14	EMCON		# EMCON
-xnet	15	XNET		# Cross Net Debugger
-chaos	16	CHAOS		# Chaos
 udp	17	UDP		# user datagram protocol
-mux	18	MUX		# Multiplexing protocol
-dcn	19	DCN-MEAS	# DCN Measurement Subsystems
 hmp	20	HMP		# host monitoring protocol
-prm	21	PRM		# packet radio measurement protocol
 xns-idp	22	XNS-IDP		# Xerox NS IDP
-trunk-1	23	TRUNK-1		# Trunk-1
-trunk-2	24	TRUNK-2		# Trunk-2
-leaf-1	25	LEAF-1		# Leaf-1
-leaf-2	26	LEAF-2		# Leaf-2
 rdp	27	RDP		# "reliable datagram" protocol
-irtp	28	IRTP		# Internet Reliable Transaction Protocol
-iso-tp4	29	ISO-TP4		# ISO Transport Protocol Class 4
-netblt	30	NETBLT		# Bulk Data Transfer Protocol
-mfe-nsp	31	MFE-NSP		# MFE Network Services Protocol
-merit-inp	32	MERIT-INP	# MERIT Internodal Protocol
-sep	33	SEP		# Sequential Exchange Protocol
-3pc	34	3PC		# Third Party Connect Protocol
-idpr	35	IDPR		# Inter-Domain Policy Routing Protocol
-xtp	36	XTP		# Xpress Tranfer Protocol
+iso-tp4	29	ISO-TP4		# ISO Transport Protocol class 4 [RFC905]
+xtp	36	XTP		# Xpress Transfer Protocol
 ddp	37	DDP		# Datagram Delivery Protocol
-idpr-cmtp	38	IDPR-CMTP	# IDPR Control Message Transport Proto
-tp++	39	TP++		# TP++ Transport Protocol
-il	40	IL		# IL Transport Protocol
-ipv6	41	IPv6		# IPv6
-sdrp	42	SDRP		# Source Demand Routing Protocol
-ipv6-route	43	IPv6-Route 	# Routing Header for IPv6
-ipv6-frag	44	IPv6-Frag	# Fragment Header for IPv6
+idpr-cmtp 38	IDPR-CMTP	# IDPR Control Message Transport
+ipv6	41	IPv6		# Internet Protocol, version 6
+ipv6-route 43	IPv6-Route	# Routing Header for IPv6
+ipv6-frag 44	IPv6-Frag	# Fragment Header for IPv6
 idrp	45	IDRP		# Inter-Domain Routing Protocol
-rsvp	46	RSVP		# Resource ReSerVation Protocol
-gre	47	GRE		# Generic Routing Encapsulation
-mhrp	48	MHRP		# Mobile Host Routing Protocol
-bna	49	BNA		# BNA
-ipv6-crypt	50	IPv6-Crypt	# Encryption Header for IPv6
-ipv6-auth	51	IPv6-Auth	# Authentication Header for IPv6
-i-nlsp	52	I-NLSP		# Integrated Net Layer Security TUBA
-swipe	53	SWIPE		# IP with Encryption
-narp	54	NARP		# NBMA Address Resolution Protocol
-mobile	55	MOBILE		# IP Mobility
-tlsp	56	TLSP		# Transport Layer Security Protocol
+rsvp	46	RSVP		# Reservation Protocol
+gre	47	GRE		# General Routing Encapsulation
+esp	50	IPSEC-ESP	# Encap Security Payload [RFC2406]
+ah	51	IPSEC-AH	# Authentication Header [RFC2402]
 skip	57	SKIP		# SKIP
-ipv6-icmp	58	IPv6-ICMP	# ICMP for IPv6
-ipv6-nonxt	59	IPv6-NoNxt	# No Next Header for IPv6
-ipv6-opts	60	IPv6-Opts	# Destination Options for IPv6
-#	61			# any host internal protocol
-cftp	62	CFTP		# CFTP
-#	63			# any local network
-sat-expak	64	SAT-EXPAK	# SATNET and Backroom EXPAK
-kryptolan	65	KRYPTOLAN	# Kryptolan
-rvd	66	RVD		# MIT Remote Virtual Disk Protocol
-ippc	67	IPPC		# Internet Pluribus Packet Core
-#	68			# any distributed file system
-sat-mon	69	SAT-MON		# SATNET Monitoring
-visa	70	VISA		# VISA Protocol
-ipcv	71	IPCV		# Internet Packet Core Utility
-cpnx	72	CPNX		# Computer Protocol Network Executive
-cphb	73	CPHB		# Computer Protocol Heart Beat
-wsn	74	WSN		# Wang Span Network
-pvp	75	PVP		# Packet Video Protocol
-br-sat-mon	76	BR-SAT-MON	# Backroom SATNET Monitoring
-sun-nd	77	SUN-ND		# SUN ND PROTOCOL-Temporary
-wb-mon	78	WB-MON		# WIDEBAND Monitoring
-wb-expak	79	WB-EXPAK	# WIDEBAND EXPAK
-iso-ip	80	ISO-IP		# ISO Internet Protocol
+ipv6-icmp 58	IPv6-ICMP	# ICMP for IPv6
+ipv6-nonxt 59	IPv6-NoNxt	# No Next Header for IPv6
+ipv6-opts 60	IPv6-Opts	# Destination Options for IPv6
+rspf	73	RSPF CPHB	# Radio Shortest Path First (officially CPHB)
 vmtp	81	VMTP		# Versatile Message Transport
-secure-vmtp	82	SECURE-VMTP	# SECURE-VMTP
-vines	83	VINES		# VINES
-ttp	84	TTP		# TTP
-nsfnet-igp	85	NSFNET-IGP	# NSFNET-IGP
-dgp	86	DGP		# Dissimilar Gateway Protocol
-tcf	87	TCF		# TCF
 eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
 ospf	89	OSPFIGP		# Open Shortest Path First IGP
-sprite-rpc	90	Sprite-RPC	# Sprite RPC Protocol
-larp	91	LARP		# Locus Address Resolution Protocol
-mtp	92	MTP		# Multicast Transport Protocol
-ax.25	93	AX.25		# AX.25 Frames
-ipip	94	IPIP		# Yet Another IP encapsulation
-micp	95	MICP		# Mobile Internetworking Control Pro.
-scc-sp	96	SCC-SP		# Semaphore Communications Sec. Pro.
-etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation
-encap	98	ENCAP		# Yet Another IP encapsulation
+ax.25	93	AX.25		# AX.25 frames
+ipip	94	IPIP		# IP-within-IP Encapsulation Protocol
+etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation [RFC3378]
+encap	98	ENCAP		# Yet Another IP encapsulation [RFC1241]
 #	99			# any private encryption scheme
-gmtp	100	GMTP		# GMTP
-ifmp	101	IFMP		# Ipsilon Flow Management Protocol
-pnni	102	PNNI		# PNNI over IP
 pim	103	PIM		# Protocol Independent Multicast
-aris	104	ARIS		# ARIS
-scps	105	SCPS		# SCPS
-qnx	106	QNX		# QNX
-a/n	107	A/N		# Active Networks
-ipcomp	108	IPComp		# IP Payload Compression Protocol
-snp	109	SNP		# Sitara Networks Protocol
-compaq-peer	110	Compaq-Peer	# Compaq Peer Protocol
-ipx-in-ip	111	IPX-in-IP	# IPX in IP
+ipcomp	108	IPCOMP		# IP Payload Compression Protocol
 vrrp	112	VRRP		# Virtual Router Redundancy Protocol
-pgm	113	PGM		# PGM Reliable Transport Protocol
-#	114			# any 0-hop protocol
-l2tp	115	L2TP		# Layer Two Tunneling Protocol
-ddx	116	DDX		# D-II Data Exchange
-iatp	117	IATP		# Interactive Agent Transfer Protocol
-st	118	ST		# Schedule Transfer
-srp	119	SRP		# SpectraLink Radio Protocol
-uti	120	UTI		# UTI
-smp	121	SMP		# Simple Message Protocol
-sm	122	SM		# SM
-ptp	123	PTP		# Performance Transparency Protocol
-isis	124	ISIS		# ISIS over IPv4
-fire	125	FIRE
-crtp	126	CRTP		# Combat Radio Transport Protocol
-crdup	127	CRUDP		# Combat Radio User Datagram
-sscopmce	128	SSCOPMCE
-iplt	129	IPLT
-sps	130	SPS		# Secure Packet Shield
-pipe	131	PIPE		# Private IP Encapsulation within IP
+l2tp	115	L2TP		# Layer Two Tunneling Protocol [RFC2661]
+isis	124	ISIS		# IS-IS over IPv4
 sctp	132	SCTP		# Stream Control Transmission Protocol
 fc	133	FC		# Fibre Channel
-#	134-254			# Unassigned
-#	255			# Reserved
+udplite	136	UDPLite		# UDP-Lite
+mpls-in-ip 137	MPLS-in-IP	# MPLS-in-IP [RFC4023]
+manet	138			# MANET Protocols
+hip	139	HIP		# Host Identity Protocol
diff --git a/services b/services
index c7de15c..59e09bd 100644
--- a/services
+++ b/services
@@ -1,147 +1,114 @@
-# /etc/services:
-# $Id: services 105871 2005-12-07 06:53:01Z flepied $
+# $Id$
 #
 # Network services, Internet style
 #
 # Note that it is presently the policy of IANA to assign a single well-known
-# port number for both TCP and UDP; hence, most entries here have two entries
+# port number for both TCP and UDP; hence, officially ports have two entries
 # even if the protocol doesn't support UDP operations.
-# Updated from RFC 1700, ``Assigned Numbers'' (October 1994).  Not all ports
-# are included, only the more common ones.
 #
-# The latest IANA port assignments can be gotten from
-#	http://www.iana.org/assignments/port-numbers
-# The Well Known Ports are those from 0 through 1023.
-# The Registered Ports are those from 1024 through 49151
-# The Dynamic and/or Private Ports are those from 49152 through 65535
-#
-# Each line describes one service, and is of the form:
-#
-# service-name  port/protocol  [aliases ...]   [# comment]
+# Updated from http://www.iana.org/assignments/port-numbers and other
+# sources like http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/services .
+# New ports will be added on request if they have been officially assigned
+# by IANA and used in the real-world or are needed by a debian package.
+# If you need a huge list of used numbers please install the nmap package.
 
 tcpmux		1/tcp				# TCP port service multiplexer
-tcpmux		1/udp				# TCP port service multiplexer
-rje		5/tcp				# Remote Job Entry
-rje		5/udp				# Remote Job Entry
 echo		7/tcp
 echo		7/udp
 discard		9/tcp		sink null
 discard		9/udp		sink null
 systat		11/tcp		users
-systat		11/udp		users
 daytime		13/tcp
 daytime		13/udp
+netstat		15/tcp
 qotd		17/tcp		quote
-qotd		17/udp		quote
 msp		18/tcp				# message send protocol
-msp		18/udp				# message send protocol
+msp		18/udp
 chargen		19/tcp		ttytst source
 chargen		19/udp		ttytst source
 ftp-data	20/tcp
-ftp-data	20/udp
-# 21 is registered to ftp, but also used by fsp
 ftp		21/tcp
-ftp		21/udp		fsp fspd
+fsp		21/udp		fspd
 ssh		22/tcp				# SSH Remote Login Protocol
-ssh		22/udp				# SSH Remote Login Protocol
+ssh		22/udp
 telnet		23/tcp
-telnet		23/udp
-# 24 - private mail system
-lmtp		24/tcp				# LMTP Mail Delivery
-lmtp		24/udp				# LMTP Mail Delivery
 smtp		25/tcp		mail
-smtp		25/udp		mail
 time		37/tcp		timserver
 time		37/udp		timserver
-rlp		39/tcp		resource	# resource location
 rlp		39/udp		resource	# resource location
 nameserver	42/tcp		name		# IEN 116
-nameserver	42/udp		name		# IEN 116
-nicname		43/tcp		whois
-nicname		43/udp		whois
+whois		43/tcp		nicname
 tacacs		49/tcp				# Login Host Protocol (TACACS)
-tacacs		49/udp				# Login Host Protocol (TACACS)
+tacacs		49/udp
 re-mail-ck	50/tcp				# Remote Mail Checking Protocol
-re-mail-ck	50/udp				# Remote Mail Checking Protocol
+re-mail-ck	50/udp
 domain		53/tcp				# name-domain server
 domain		53/udp
-whois++		63/tcp
-whois++		63/udp
+mtp		57/tcp				# deprecated
+tacacs-ds	65/tcp				# TACACS-Database Service
+tacacs-ds	65/udp
 bootps		67/tcp				# BOOTP server
 bootps		67/udp
-bootpc		68/tcp		dhcpc		# BOOTP client
-bootpc		68/udp		dhcpc
-tftp		69/tcp
+bootpc		68/tcp				# BOOTP client
+bootpc		68/udp
 tftp		69/udp
 gopher		70/tcp				# Internet Gopher
 gopher		70/udp
-netrjs-1	71/tcp				# Remote Job Service
-netrjs-1	71/udp				# Remote Job Service
-netrjs-2	72/tcp				# Remote Job Service
-netrjs-2	72/udp				# Remote Job Service
-netrjs-3	73/tcp				# Remote Job Service
-netrjs-3	73/udp				# Remote Job Service
-netrjs-4	74/tcp				# Remote Job Service
-netrjs-4	74/udp				# Remote Job Service
+rje		77/tcp		netrjs
 finger		79/tcp
-finger		79/udp
-http		80/tcp		www www-http	# WorldWideWeb HTTP
-http		80/udp		www www-http	# HyperText Transfer Protocol
-kerberos	88/tcp		kerberos5 krb5	# Kerberos v5
-kerberos	88/udp		kerberos5 krb5	# Kerberos v5
+www		80/tcp		http		# WorldWideWeb HTTP
+www		80/udp				# HyperText Transfer Protocol
+link		87/tcp		ttylink
+kerberos	88/tcp		kerberos5 krb5 kerberos-sec	# Kerberos v5
+kerberos	88/udp		kerberos5 krb5 kerberos-sec	# Kerberos v5
 supdup		95/tcp
-supdup		95/udp
-hostname	101/tcp		hostnames	# usually from sri-nic
-hostname	101/udp		hostnames	# usually from sri-nic
-iso-tsap	102/tcp		tsap		# part of ISODE.
-csnet-ns	105/tcp		cso		# also used by CSO name server
-csnet-ns	105/udp		cso
-# unfortunately the poppassd (Eudora) uses a port which has already
-# been assigned to a different service. We list the poppassd as an
-# alias here. This should work for programs asking for this service.
-# (due to a bug in inetd the 3com-tsmux line is disabled)
-#3com-tsmux	106/tcp		poppassd
-#3com-tsmux	106/udp		poppassd
+hostnames	101/tcp		hostname	# usually from sri-nic
+iso-tsap	102/tcp		tsap		# part of ISODE
+acr-nema	104/tcp		dicom		# Digital Imag. & Comm. 300
+acr-nema	104/udp		dicom		# Digital Imag. & Comm. 300
+csnet-ns	105/tcp		cso-ns		# also used by CSO name server
+csnet-ns	105/udp		cso-ns
 rtelnet		107/tcp				# Remote Telnet
 rtelnet		107/udp
-pop2		109/tcp		pop-2	postoffice	# POP version 2
+pop2		109/tcp		postoffice pop-2 # POP version 2
 pop2		109/udp		pop-2
 pop3		110/tcp		pop-3		# POP version 3
 pop3		110/udp		pop-3
-sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper TCP
-sunrpc		111/udp		portmapper	# RPC 4.0 portmapper UDP
+sunrpc		111/tcp		portmapper	# RPC 4.0 portmapper
+sunrpc		111/udp		portmapper
 auth		113/tcp		authentication tap ident
-auth		113/udp		authentication tap ident
 sftp		115/tcp
-sftp		115/udp
 uucp-path	117/tcp
-uucp-path	117/udp
 nntp		119/tcp		readnews untp	# USENET News Transfer Protocol
-nntp		119/udp		readnews untp	# USENET News Transfer Protocol
 ntp		123/tcp
 ntp		123/udp				# Network Time Protocol
+pwdgen		129/tcp				# PWDGEN service
+pwdgen		129/udp				# PWDGEN service
+loc-srv		135/tcp		epmap		# Location Service
+loc-srv		135/udp		epmap
 netbios-ns	137/tcp				# NETBIOS Name Service
 netbios-ns	137/udp
 netbios-dgm	138/tcp				# NETBIOS Datagram Service
 netbios-dgm	138/udp
 netbios-ssn	139/tcp				# NETBIOS session service
 netbios-ssn	139/udp
-imap		143/tcp		imap2		# Interim Mail Access Proto v2
-imap		143/udp		imap2
-snmp		161/tcp				# Simple Net Mgmt Proto
-snmp		161/udp				# Simple Net Mgmt Proto
-snmptrap	162/udp		snmp-trap	# Traps for SNMP
+imap2		143/tcp		imap		# Interim Mail Access P 2 and 4
+imap2		143/udp		imap
+snmp		161/tcp				# Simple Net Mgmt Protocol
+snmp		161/udp				# Simple Net Mgmt Protocol
+snmp-trap	162/tcp		snmptrap	# Traps for SNMP
+snmp-trap	162/udp		snmptrap	# Traps for SNMP
 cmip-man	163/tcp				# ISO mgmt over IP (CMOT)
 cmip-man	163/udp
 cmip-agent	164/tcp
 cmip-agent	164/udp
-mailq		174/tcp				# MAILQ
-mailq		174/udp				# MAILQ
+mailq		174/tcp			# Mailer transport queue for Zmailer
+mailq		174/udp			# Mailer transport queue for Zmailer
 xdmcp		177/tcp				# X Display Mgr. Control Proto
 xdmcp		177/udp
 nextstep	178/tcp		NeXTStep NextStep	# NeXTStep window
-nextstep	178/udp		NeXTStep NextStep	# server
-bgp		179/tcp				# Border Gateway Proto.
+nextstep	178/udp		NeXTStep NextStep	#  server
+bgp		179/tcp				# Border Gateway Protocol
 bgp		179/udp
 prospero	191/tcp				# Cliff Neuman's Prospero
 prospero	191/udp
@@ -159,100 +126,58 @@ at-zis		206/tcp				# AppleTalk zone information
 at-zis		206/udp
 qmtp		209/tcp				# Quick Mail Transfer Protocol
 qmtp		209/udp				# Quick Mail Transfer Protocol
-z39.50		210/tcp		z3950 wais	# NISO Z39.50 database
-z39.50		210/udp		z3950 wais
+z3950		210/tcp		wais		# NISO Z39.50 database
+z3950		210/udp		wais
 ipx		213/tcp				# IPX
 ipx		213/udp
 imap3		220/tcp				# Interactive Mail Access
 imap3		220/udp				# Protocol v3
-link		245/tcp		ttylink
-link		245/udp		ttylink
+pawserv		345/tcp				# Perf Analysis Workbench
+pawserv		345/udp
+zserv		346/tcp				# Zebra server
+zserv		346/udp
 fatserv		347/tcp				# Fatmen Server
-fatserv		347/udp				# Fatmen Server
-rsvp_tunnel	363/tcp
-rsvp_tunnel	363/udp
-odmr		366/tcp				# odmr required by fetchmail
-odmr		366/udp				# odmr required by fetchmail
+fatserv		347/udp
 rpc2portmap	369/tcp
 rpc2portmap	369/udp				# Coda portmapper
 codaauth2	370/tcp
 codaauth2	370/udp				# Coda authentication server
-ulistproc	372/tcp		ulistserv	# UNIX Listserv
-ulistproc	372/udp		ulistserv
-ldap		389/tcp
+clearcase	371/tcp		Clearcase
+clearcase	371/udp		Clearcase
+ulistserv	372/tcp				# UNIX Listserv
+ulistserv	372/udp
+ldap		389/tcp			# Lightweight Directory Access Protocol
 ldap		389/udp
-svrloc		427/tcp				# Server Location Protocl
-svrloc		427/udp				# Server Location Protocl
-mobileip-agent	434/tcp
-mobileip-agent	434/udp
-mobilip-mn	435/tcp
-mobilip-mn	435/udp
-https		443/tcp				# MCom
-https		443/udp				# MCom
+imsp		406/tcp			# Interactive Mail Support Protocol
+imsp		406/udp
+svrloc		427/tcp				# Server Location
+svrloc		427/udp				# Server Location
+https		443/tcp				# http protocol over TLS/SSL
+https		443/udp
 snpp		444/tcp				# Simple Network Paging Protocol
-snpp		444/udp				# Simple Network Paging Protocol
-microsoft-ds	445/tcp
+snpp		444/udp
+microsoft-ds	445/tcp				# Microsoft Naked CIFS
 microsoft-ds	445/udp
-kpasswd		464/tcp		kpwd		# Kerberos "passwd"
-kpasswd		464/udp		kpwd		# Kerberos "passwd"
-photuris	468/tcp
-photuris	468/udp
-saft		487/tcp				# Simple Asynchronous File Transfer
-saft		487/udp				# Simple Asynchronous File Transfer
-gss-http	488/tcp
-gss-http	488/udp
-pim-rp-disc	496/tcp
-pim-rp-disc	496/udp
-isakmp		500/tcp
-isakmp		500/udp
-gdomap		538/tcp				# GNUstep distributed objects
-gdomap		538/udp				# GNUstep distributed objects
-iiop		535/tcp
-iiop		535/udp
-dhcpv6-client	546/tcp
-dhcpv6-client	546/udp
-dhcpv6-server	547/tcp
-dhcpv6-server	547/udp
-rtsp		554/tcp				# Real Time Stream Control Protocol
-rtsp		554/udp				# Real Time Stream Control Protocol
-nntps		563/tcp				# NNTP over SSL
-nntps		563/udp				# NNTP over SSL
-whoami		565/tcp
-whoami		565/udp
-submission	587/tcp		msa		# mail message submission
-submission	587/udp		msa		# mail message submission
-npmp-local	610/tcp		dqs313_qmaster	# npmp-local / DQS
-npmp-local	610/udp		dqs313_qmaster	# npmp-local / DQS
-npmp-gui	611/tcp		dqs313_execd	# npmp-gui / DQS
-npmp-gui	611/udp		dqs313_execd	# npmp-gui / DQS
-hmmp-ind	612/tcp		dqs313_intercell # HMMP Indication / DQS
-hmmp-ind	612/udp		dqs313_intercell # HMMP Indication / DQS
+kpasswd		464/tcp
+kpasswd		464/udp
+saft		487/tcp			# Simple Asynchronous File Transfer
+saft		487/udp
+isakmp		500/tcp			# IPsec - Internet Security Association
+isakmp		500/udp			#  and Key Management Protocol
+rtsp		554/tcp			# Real Time Stream Control Protocol
+rtsp		554/udp			# Real Time Stream Control Protocol
+nqs		607/tcp				# Network Queuing system
+nqs		607/udp
+npmp-local	610/tcp		dqs313_qmaster		# npmp-local / DQS
+npmp-local	610/udp		dqs313_qmaster
+npmp-gui	611/tcp		dqs313_execd		# npmp-gui / DQS
+npmp-gui	611/udp		dqs313_execd
+hmmp-ind	612/tcp		dqs313_intercell	# HMMP Indication / DQS
+hmmp-ind	612/udp		dqs313_intercell
+qmqp		628/tcp
+qmqp		628/udp
 ipp		631/tcp				# Internet Printing Protocol
-ipp		631/udp				# Internet Printing Protocol
-ldaps		636/tcp				# LDAP over SSL
-ldaps		636/udp				# LDAP over SSL
-acap		674/tcp
-acap		674/udp
-ha-cluster	694/tcp				# Heartbeat HA-cluster
-ha-cluster	694/udp				# Heartbeat HA-cluster
-kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
-kerberos-iv	750/udp		kerberos4 kerberos-sec kdc
-kerberos-iv	750/tcp		kerberos4 kerberos-sec kdc
-webster		765/tcp				# Network dictionary
-webster		765/udp
-phonebook	767/tcp				# Network phonebook
-phonebook	767/udp
-rsync		873/tcp				# rsync
-rsync		873/udp				# rsync
-telnets		992/tcp
-telnets		992/udp
-imaps		993/tcp				# IMAP over SSL
-imaps		993/udp				# IMAP over SSL
-ircs		994/tcp
-ircs		994/udp
-pop3s		995/tcp				# POP-3 over SSL
-pop3s		995/udp				# POP-3 over SSL
-
+ipp		631/udp
 #
 # UNIX specific services
 #
@@ -263,117 +188,127 @@ who		513/udp		whod
 shell		514/tcp		cmd		# no passwords used
 syslog		514/udp
 printer		515/tcp		spooler		# line printer spooler
-printer		515/udp		spooler		# line printer spooler
 talk		517/udp
 ntalk		518/udp
-utime		519/tcp		unixtime
-utime		519/udp		unixtime
-efs		520/tcp
-router		520/udp		route routed	# RIP
-ripng		521/tcp
-ripng		521/udp
-timed		525/tcp		timeserver
+route		520/udp		router routed	# RIP
 timed		525/udp		timeserver
 tempo		526/tcp		newdate
 courier		530/tcp		rpc
 conference	531/tcp		chat
-netnews		532/tcp
-netwall		533/udp				# -for emergency broadcasts
+netnews		532/tcp		readnews
+netwall		533/udp				# for emergency broadcasts
+gdomap		538/tcp				# GNUstep distributed objects
+gdomap		538/udp
 uucp		540/tcp		uucpd		# uucp daemon
 klogin		543/tcp				# Kerberized `rlogin' (v5)
 kshell		544/tcp		krcmd		# Kerberized `rsh' (v5)
+dhcpv6-client	546/tcp
+dhcpv6-client	546/udp
+dhcpv6-server	547/tcp
+dhcpv6-server	547/udp
 afpovertcp	548/tcp				# AFP over TCP
-afpovertcp	548/udp				# AFP over TCP
+afpovertcp	548/udp
+idfp		549/tcp
+idfp		549/udp
 remotefs	556/tcp		rfs_server rfs	# Brunhoff remote filesystem
-
+nntps		563/tcp		snntp		# NNTP over SSL
+nntps		563/udp		snntp
+submission	587/tcp				# Submission [RFC4409]
+submission	587/udp
+ldaps		636/tcp				# LDAP over SSL
+ldaps		636/udp
+tinc		655/tcp				# tinc control port
+tinc		655/udp
+silc		706/tcp
+silc		706/udp
+kerberos-adm	749/tcp				# Kerberos `kadmin' (v5)
+#
+webster		765/tcp				# Network dictionary
+webster		765/udp
+rsync		873/tcp
+rsync		873/udp
+ftps-data	989/tcp				# FTP over SSL (data)
+ftps		990/tcp
+telnets		992/tcp				# Telnet over SSL
+telnets		992/udp
+imaps		993/tcp				# IMAP over SSL
+imaps		993/udp
+ircs		994/tcp				# IRC over SSL
+ircs		994/udp
+pop3s		995/tcp				# POP-3 over SSL
+pop3s		995/udp
 #
-# From ``PORT NUMBERS'':
+# From ``Assigned Numbers'':
 #
-#>REGISTERED PORT NUMBERS
-#>
-#>The Registered Ports are listed by the IANA and on most systems can be
-#>used by ordinary user processes or programs executed by ordinary
-#>users.
-#>
-#>Ports are used in the TCP [RFC793] to name the ends of logical
-#>connections which carry long term conversations.  For the purpose of
-#>providing services to unknown callers, a service contact port is
-#>defined.  This list specifies the port used by the server process as
-#>its contact port.
-#>
-#>The IANA registers uses of these ports as a convienence to the
-#>community.
+#> The Registered Ports are not controlled by the IANA and on most systems
+#> can be used by ordinary user processes or programs executed by ordinary
+#> users.
+#
+#> Ports are used in the TCP [45,106] to name the ends of logical
+#> connections which carry long term conversations.  For the purpose of
+#> providing services to unknown callers, a service contact port is
+#> defined.  This list specifies the port used by the server process as its
+#> contact port.  While the IANA can not control uses of these ports it
+#> does register or list uses of these ports as a convienence to the
+#> community.
 #
-# http://www.iana.org/assignments/port-numbers
-
 socks		1080/tcp			# socks proxy server
-socks		1080/udp			# socks proxy server
-mysql-cluster	1186/tcp			# MySQL Cluster Manager
-mysql-cluster	1186/udp			# MySQL Cluster Manager
-# Port 1236 is registered as `bvcontrol', but is also used by the
-# Gracilis Packeten remote config server.  The official name is listed as
-# the primary name, with the unregistered name as an alias.
-bvcontrol	1236/tcp	rmtcfg		# Daniel J. Walsh, Gracilis Packeten remote config server
-bvcontrol	1236/udp			# Daniel J. Walsh
-h323hostcallsc	1300/tcp			# H323 Host Call Secure
-h323hostcallsc	1300/udp			# H323 Host Call Secure
-ms-sql-s	1433/tcp			# Microsoft-SQL-Server
-ms-sql-s	1433/udp			# Microsoft-SQL-Server
-ms-sql-m	1434/tcp			# Microsoft-SQL-Monitor
-ms-sql-m	1434/udp			# Microsoft-SQL-Monitor
-ica		1494/tcp			# Citrix ICA Client
-ica		1494/udp			# Citrix ICA Client
-wins		1512/tcp			# Microsoft's Windows Internet Name Service
-wins		1512/udp			# Microsoft's Windows Internet Name Service
+socks		1080/udp
+proofd		1093/tcp
+proofd		1093/udp
+rootd		1094/tcp
+rootd		1094/udp
+openvpn		1194/tcp
+openvpn		1194/udp
+rmiregistry	1099/tcp			# Java RMI Registry
+rmiregistry	1099/udp
+kazaa		1214/tcp
+kazaa		1214/udp
+nessus		1241/tcp			# Nessus vulnerability
+nessus		1241/udp			#  assessment scanner
+lotusnote	1352/tcp	lotusnotes	# Lotus Note
+lotusnote	1352/udp	lotusnotes
+ms-sql-s	1433/tcp			# Microsoft SQL Server
+ms-sql-s	1433/udp
+ms-sql-m	1434/tcp			# Microsoft SQL Monitor
+ms-sql-m	1434/udp
 ingreslock	1524/tcp
 ingreslock	1524/udp
 prospero-np	1525/tcp			# Prospero non-privileged
 prospero-np	1525/udp
-datametrics	1645/tcp	old-radius	# datametrics / old radius entry
-datametrics	1645/udp	old-radius	# datametrics / old radius entry
-sa-msg-port	1646/tcp	old-radacct	# sa-msg-port / old radacct entry
-sa-msg-port	1646/udp	old-radacct	# sa-msg-port / old radacct entry
+datametrics	1645/tcp	old-radius
+datametrics	1645/udp	old-radius
+sa-msg-port	1646/tcp	old-radacct
+sa-msg-port	1646/udp	old-radacct
 kermit		1649/tcp
 kermit		1649/udp
-l2tp		1701/tcp	l2f
-l2tp		1701/udp	l2f
-h323gatedisc	1718/tcp
-h323gatedisc	1718/udp
-h323gatestat	1719/tcp
-h323gatestat	1719/udp
-h323hostcall	1720/tcp
-h323hostcall	1720/udp
-tftp-mcast	1758/tcp
-tftp-mcast	1758/udp
-mtftp		1759/udp
-hello		1789/tcp
-hello		1789/udp
-radius		1812/tcp			# Radius
-radius		1812/udp			# Radius
+l2f		1701/tcp	l2tp
+l2f		1701/udp	l2tp
+radius		1812/tcp
+radius		1812/udp
 radius-acct	1813/tcp	radacct		# Radius Accounting
-radius-acct	1813/udp	radacct		# Radius Accounting
-mtp		1911/tcp			#
-mtp		1911/udp			#
-hsrp		1985/tcp			# Cisco Hot Standby Router Protocol
-hsrp		1985/udp			# Cisco Hot Standby Router Protocol
-licensedaemon	1986/tcp
-licensedaemon	1986/udp
-gdp-port	1997/tcp			# Cisco Gateway Discovery Protocol
-gdp-port	1997/udp			# Cisco Gateway Discovery Protocol
-sieve		2000/tcp			# Sieve Mail Filter Daemon
-sieve		2000/udp			# Sieve Mail Filter Daemon
-nfs		2049/tcp	nfsd
-nfs		2049/udp	nfsd
-zephyr-srv	2102/tcp			# Zephyr server
-zephyr-srv	2102/udp			# Zephyr server
-zephyr-clt	2103/tcp			# Zephyr serv-hm connection
-zephyr-clt	2103/udp			# Zephyr serv-hm connection
-zephyr-hm	2104/tcp			# Zephyr hostmanager
-zephyr-hm	2104/udp			# Zephyr hostmanager
-mysql-im	2273/tcp			# MySQL Instance Manager
-mysql-im	2273/udp			# MySQL Instance Manager
+radius-acct	1813/udp	radacct
+msnp		1863/tcp			# MSN Messenger
+msnp		1863/udp
+unix-status	1957/tcp			# remstats unix-status server
+log-server	1958/tcp			# remstats log server
+remoteping	1959/tcp			# remstats remoteping server
+cisco-sccp	2000/tcp			# Cisco SCCP
+cisco-sccp	2000/udp
+search		2010/tcp	ndtp
+pipe_server	2010/tcp
+nfs		2049/tcp			# Network File System
+nfs		2049/udp			# Network File System
+gnunet		2086/tcp
+gnunet		2086/udp
+rtcm-sc104	2101/tcp			# RTCM SC-104 IANA 1/29/99
+rtcm-sc104	2101/udp
+gsigatekeeper	2119/tcp
+gsigatekeeper	2119/udp
+gris		2135/tcp		# Grid Resource Information Server
+gris		2135/udp		# Grid Resource Information Server
 cvspserver	2401/tcp			# CVS client/server operations
-cvspserver	2401/udp			# CVS client/server operations
+cvspserver	2401/udp
 venus		2430/tcp			# codacon port
 venus		2430/udp			# Venus callback/wbc interface
 venus-se	2431/tcp			# tcp side effects
@@ -381,215 +316,276 @@ venus-se	2431/udp			# udp sftp side effect
 codasrv		2432/tcp			# not used
 codasrv		2432/udp			# server port
 codasrv-se	2433/tcp			# tcp side effects
-codasrv-se	2433/udp			# udp sftp side effectQ
-
-# Ports numbered 2600 through 2606 are used by the zebra package without
-# being registred.  The primary names are the registered names, and the
-# unregistered names used by zebra are listed as aliases.
-hpstgmgr	2600/tcp	zebrasrv	# HPSTGMGR
-hpstgmgr	2600/udp			# HPSTGMGR
-discp-client	2601/tcp	zebra		# discp client
-discp-client	2601/udp			# discp client
-discp-server	2602/tcp	ripd		# discp server
-discp-server	2602/udp			# discp server
-servicemeter	2603/tcp	ripngd		# Service Meter
-servicemeter	2603/udp			# Service Meter
-nsc-ccs		2604/tcp	ospfd		# NSC CCS
-nsc-ccs		2604/udp			# NSC CCS
-nsc-posa	2605/tcp	bgpd		# NSC POSA
-nsc-posa	2605/udp			# NSC POSA
-netmon		2606/tcp	ospf6d		# Dell Netmon
-netmon		2606/udp			# Dell Netmon
-dict		2628/tcp			# RFC 2229
-dict		2628/udp			# RFC 2229
-corbaloc	2809/tcp			# CORBA naming service locator
-icpv2		3130/tcp			# Internet Cache Protocol V2 (Squid)
-icpv2		3130/udp			# Internet Cache Protocol V2 (Squid)
-mysql		3306/tcp			# MySQL
-mysql		3306/udp			# MySQL
-trnsprntproxy	3346/tcp			# Trnsprnt Proxy
-trnsprntproxy	3346/udp			# Trnsprnt Proxy
+codasrv-se	2433/udp			# udp sftp side effect
+mon		2583/tcp			# MON traps
+mon		2583/udp
+dict		2628/tcp			# Dictionary server
+dict		2628/udp
+gsiftp		2811/tcp
+gsiftp		2811/udp
+gpsd		2947/tcp
+gpsd		2947/udp
+gds_db		3050/tcp			# InterBase server
+gds_db		3050/udp
+icpv2		3130/tcp	icp		# Internet Cache Protocol
+icpv2		3130/udp	icp
+mysql		3306/tcp
+mysql		3306/udp
 nut		3493/tcp			# Network UPS Tools
-pxe		4011/udp			# PXE server
-fud		4201/udp			# Cyrus IMAP FUD Daemon
-rwhois		4321/tcp			# Remote Who Is
-rwhois		4321/udp			# Remote Who Is
-krb524		4444/tcp			# Kerberos 5 to 4 ticket xlator
-krb524		4444/udp			# Kerberos 5 to 4 ticket xlator
+nut		3493/udp
+distcc		3632/tcp			# distributed compiler
+distcc		3632/udp
+daap		3689/tcp			# Digital Audio Access Protocol
+daap		3689/udp
+svn		3690/tcp	subversion	# Subversion protocol
+svn		3690/udp	subversion
+suucp		4031/tcp			# UUCP over SSL
+suucp		4031/udp			# UUCP over SSL
+sysrqd		4094/tcp			# sysrq daemon
+sysrqd		4094/udp			# sysrq daemon
+sieve		4190/tcp			# ManageSieve Protocol
+remctl		4373/tcp		# Remote Authenticated Command Service
+remctl		4373/udp		# Remote Authenticated Command Service
 iax		4569/tcp			# Inter-Asterisk eXchange
-iax		4569/udp			# Inter-Asterisk eXchange
-rfe		5002/tcp			# Radio Free Ethernet
-rfe		5002/udp			# Actually uses UDP only
-cfengine	5308/tcp			# CFengine
-cfengine	5308/udp			# CFengine
-cvsup		5999/tcp	CVSup		# CVSup file transfer/John Polstra/FreeBSD
-cvsup		5999/udp	CVSup		# CVSup file transfer/John Polstra/FreeBSD
-x11		6000/tcp	X		# the X Window System
-sane-port	6566/tcp			# SANE Control Port
-afs3-fileserver	7000/tcp			# file server itself
-afs3-fileserver	7000/udp			# file server itself
+iax		4569/udp
+radmin-port	4899/tcp			# RAdmin Port
+radmin-port	4899/udp
+rfe		5002/udp			# Radio Free Ethernet
+rfe		5002/tcp
+mmcc		5050/tcp	# multimedia conference control tool (Yahoo IM)
+mmcc		5050/udp
+sip		5060/tcp			# Session Initiation Protocol
+sip		5060/udp
+sip-tls		5061/tcp
+sip-tls		5061/udp
+aol		5190/tcp			# AIM
+aol		5190/udp
+xmpp-client	5222/tcp	jabber-client	# Jabber Client Connection
+xmpp-client	5222/udp	jabber-client
+xmpp-server	5269/tcp	jabber-server	# Jabber Server Connection
+xmpp-server	5269/udp	jabber-server
+cfengine	5308/tcp
+cfengine	5308/udp
+mdns		5353/tcp			# Multicast DNS
+mdns		5353/udp			# Multicast DNS
+postgresql	5432/tcp	postgres	# PostgreSQL Database
+postgresql	5432/udp	postgres
+freeciv		5556/tcp	rptp		# Freeciv gameplay
+freeciv		5556/udp
+amqp		5672/tcp
+amqp		5672/udp
+amqp		5672/sctp
+ggz		5688/tcp			# GGZ Gaming Zone
+ggz		5688/udp			# GGZ Gaming Zone
+x11		6000/tcp	x11-0		# X Window System
+x11		6000/udp	x11-0
+x11-1		6001/tcp
+x11-1		6001/udp
+x11-2		6002/tcp
+x11-2		6002/udp
+x11-3		6003/tcp
+x11-3		6003/udp
+x11-4		6004/tcp
+x11-4		6004/udp
+x11-5		6005/tcp
+x11-5		6005/udp
+x11-6		6006/tcp
+x11-6		6006/udp
+x11-7		6007/tcp
+x11-7		6007/udp
+gnutella-svc	6346/tcp			# gnutella
+gnutella-svc	6346/udp
+gnutella-rtr	6347/tcp			# gnutella
+gnutella-rtr	6347/udp
+sge_qmaster	6444/tcp			# Grid Engine Qmaster Service
+sge_qmaster	6444/udp			# Grid Engine Qmaster Service
+sge_execd	6445/tcp			# Grid Engine Execution Service
+sge_execd	6445/udp			# Grid Engine Execution Service
+afs3-fileserver 7000/tcp	bbs		# file server itself
+afs3-fileserver 7000/udp	bbs
 afs3-callback	7001/tcp			# callbacks to cache managers
-afs3-callback	7001/udp			# callbacks to cache managers
+afs3-callback	7001/udp
 afs3-prserver	7002/tcp			# users & groups database
-afs3-prserver	7002/udp			# users & groups database
+afs3-prserver	7002/udp
 afs3-vlserver	7003/tcp			# volume location database
-afs3-vlserver	7003/udp			# volume location database
-afs3-kaserver	7004/tcp			# AFS/Kerberos authentication service
-afs3-kaserver	7004/udp			# AFS/Kerberos authentication service
+afs3-vlserver	7003/udp
+afs3-kaserver	7004/tcp			# AFS/Kerberos authentication
+afs3-kaserver	7004/udp
 afs3-volser	7005/tcp			# volume managment server
-afs3-volser	7005/udp			# volume managment server
+afs3-volser	7005/udp
 afs3-errors	7006/tcp			# error interpretation service
-afs3-errors	7006/udp			# error interpretation service
+afs3-errors	7006/udp
 afs3-bos	7007/tcp			# basic overseer process
-afs3-bos	7007/udp			# basic overseer process
+afs3-bos	7007/udp
 afs3-update	7008/tcp			# server-to-server updater
-afs3-update	7008/udp			# server-to-server updater
+afs3-update	7008/udp
 afs3-rmtsys	7009/tcp			# remote cache manager service
-afs3-rmtsys	7009/udp			# remote cache manager service
-privoxy		8118/tcp			# privoxy junk proxy
-sd		9876/tcp			# Session Director
-sd		9876/udp			# Session Director
+afs3-rmtsys	7009/udp
+font-service	7100/tcp	xfs		# X Font Service
+font-service	7100/udp	xfs
+http-alt	8080/tcp	webcache	# WWW caching service
+http-alt	8080/udp			# WWW caching service
+bacula-dir	9101/tcp			# Bacula Director
+bacula-dir	9101/udp
+bacula-fd	9102/tcp			# Bacula File Daemon
+bacula-fd	9102/udp
+bacula-sd	9103/tcp			# Bacula Storage Daemon
+bacula-sd	9103/udp
+xmms2		9667/tcp	# Cross-platform Music Multiplexing System
+xmms2		9667/udp	# Cross-platform Music Multiplexing System
+zabbix-agent	10050/tcp			# Zabbix Agent
+zabbix-agent	10050/udp			# Zabbix Agent
+zabbix-trapper	10051/tcp			# Zabbix Trapper
+zabbix-trapper	10051/udp			# Zabbix Trapper
 amanda		10080/tcp			# amanda backup services
-amanda		10080/udp			# amanda backup services
-pgpkeyserver	11371/tcp			# PGP/GPG public keyserver
-pgpkeyserver	11371/udp			# PGP/GPG public keyserver
-h323callsigalt	11720/tcp			# H323 Call Signal Alternate
-h323callsigalt	11720/udp			# H323 Call Signal Alternate
-
-bprd		13720/tcp			# BPRD (VERITAS NetBackup)
-bprd		13720/udp			# BPRD (VERITAS NetBackup)
-bpdbm		13721/tcp			# BPDBM (VERITAS NetBackup)
-bpdbm		13721/udp			# BPDBM (VERITAS NetBackup)
+amanda		10080/udp
+hkp		11371/tcp			# OpenPGP HTTP Keyserver
+hkp		11371/udp			# OpenPGP HTTP Keyserver
+bprd		13720/tcp			# VERITAS NetBackup
+bprd		13720/udp
+bpdbm		13721/tcp			# VERITAS NetBackup
+bpdbm		13721/udp
 bpjava-msvc	13722/tcp			# BP Java MSVC Protocol
-bpjava-msvc	13722/udp			# BP Java MSVC Protocol
+bpjava-msvc	13722/udp
 vnetd		13724/tcp			# Veritas Network Utility
-vnetd		13724/udp			# Veritas Network Utility
+vnetd		13724/udp
 bpcd		13782/tcp			# VERITAS NetBackup
-bpcd		13782/udp			# VERITAS NetBackup
-vopied		13783/tcp			# VOPIED Protocol
-vopied		13783/udp			# VOPIED Protocol
-
-# This port is registered as wnn6, but also used under the unregistered name
-# "wnn4" by the FreeWnn package.
-wnn6		22273/tcp	wnn4
-wnn6		22273/udp	wnn4
-
-quake		26000/tcp
-quake		26000/udp
-wnn6-ds		26208/tcp
-wnn6-ds		26208/udp
-traceroute	33434/tcp
-traceroute	33434/udp
+bpcd		13782/udp
+vopied		13783/tcp			# VERITAS NetBackup
+vopied		13783/udp
+wnn6		22273/tcp			# wnn6
+wnn6		22273/udp
 
 #
 # Datagram Delivery Protocol services
 #
-rtmp		1/ddp				# Routing Table Maintenance Protocol
-nbp		2/ddp				# Name Binding Protocol
-echo		4/ddp				# AppleTalk Echo Protocol
-zip		6/ddp				# Zone Information Protocol
+rtmp		1/ddp			# Routing Table Maintenance Protocol
+nbp		2/ddp			# Name Binding Protocol
+echo		4/ddp			# AppleTalk Echo Protocol
+zip		6/ddp			# Zone Information Protocol
+
+#=========================================================================
+# The remaining port numbers are not as allocated by IANA.
+#=========================================================================
 
-#
 # Kerberos (Project Athena/MIT) services
-# Note that these are for Kerberos v4, and are unregistered/unofficial.  Sites
-# running v4 should uncomment these and comment out the v5 entries above.
+# Note that these are for Kerberos v4, and are unofficial.  Sites running
+# v4 should uncomment these and comment out the v5 entries above.
 #
+kerberos4	750/udp		kerberos-iv kdc	# Kerberos (server)
+kerberos4	750/tcp		kerberos-iv kdc
 kerberos_master	751/udp				# Kerberos authentication
-kerberos_master	751/tcp				# Kerberos authentication
+kerberos_master	751/tcp
 passwd_server	752/udp				# Kerberos passwd server
+krb_prop	754/tcp		krb5_prop hprop	# Kerberos slave propagation
 krbupdate	760/tcp		kreg		# Kerberos registration
+swat		901/tcp				# swat
 kpop		1109/tcp			# Pop with Kerberos
 knetd		2053/tcp			# Kerberos de-multiplexor
-
-#
-# Kerberos 5 services, also not registered with IANA
-#
-krb5_prop	754/tcp				# Kerberos slave propagation
+zephyr-srv	2102/udp			# Zephyr server
+zephyr-clt	2103/udp			# Zephyr serv-hm connection
+zephyr-hm	2104/udp			# Zephyr hostmanager
 eklogin		2105/tcp			# Kerberos encrypted rlogin
-
+# Hmmm. Are we using Kv4 or Kv5 now? Worrying.
+# The following is probably Kerberos v5  --- ajt@debian.org (11/02/2000)
+kx		2111/tcp			# X over Kerberos
+iprop		2121/tcp			# incremental propagation
 #
-# Unregistered but necessary(?) (for NetBSD) services
+# Unofficial but necessary (for NetBSD) services
 #
 supfilesrv	871/tcp				# SUP server
 supfiledbg	1127/tcp			# SUP debugging
 
 #
-# Unregistered but useful/necessary other services
+# Services added for the Debian GNU/Linux distribution
 #
-netstat		15/tcp				# (was once asssigned, no more)
-linuxconf	98/tcp				# Linuxconf HTML access
+linuxconf	98/tcp				# LinuxConf
 poppassd	106/tcp				# Eudora
-poppassd	106/udp				# Eudora
-smtps		465/tcp				# SMTP over SSL (TLS)
-gii		616/tcp				# gated interactive interface
+poppassd	106/udp
+ssmtp		465/tcp		smtps		# SMTP over SSL
+moira_db	775/tcp				# Moira database
+moira_update	777/tcp				# Moira update protocol
+moira_ureg	779/udp				# Moira user registration
+spamd		783/tcp				# spamassassin daemon
 omirr		808/tcp		omirrd		# online mirror
-omirr		808/udp		omirrd		# online mirror
-swat		901/tcp				# Samba Web Administration Tool
-rndc		953/tcp				# rndc control sockets (BIND 9)
-rndc		953/udp				# rndc control sockets (BIND 9)
-skkserv		1178/tcp			# SKK Japanese input method
+omirr		808/udp		omirrd
+customs		1001/tcp			# pmake customs server
+customs		1001/udp
+skkserv		1178/tcp			# skk jisho server port
+predict		1210/udp			# predict -- satellite tracking
 rmtcfg		1236/tcp			# Gracilis Packeten remote config server
+wipld		1300/tcp			# Wipl network monitor
 xtel		1313/tcp			# french minitel
-support		1529/tcp	prmsd gnatsd	# GNATS, cygnus bug tracker
+xtelw		1314/tcp			# french minitel
+support		1529/tcp			# GNATS
 cfinger		2003/tcp			# GNU Finger
-iprop		2121/tcp			# Heimdal
+frox		2121/tcp			# frox: caching ftp proxy
 ninstall	2150/tcp			# ninstall service
-ninstall	2150/udp			# ninstall service
+ninstall	2150/udp
+zebrasrv	2600/tcp			# zebra service
+zebra		2601/tcp			# zebra vty
+ripd		2602/tcp			# ripd vty (zebra)
+ripngd		2603/tcp			# ripngd vty (zebra)
+ospfd		2604/tcp			# ospfd vty (zebra)
+bgpd		2605/tcp			# bgpd vty (zebra)
+ospf6d		2606/tcp			# ospf6d vty (zebra)
+ospfapi		2607/tcp			# OSPF-API
+isisd		2608/tcp			# ISISd vty (zebra)
 afbackup	2988/tcp			# Afbackup system
-afbackup	2988/udp			# Afbackup system
-squid		3128/tcp			# squid web proxy
-prsvp		3455/tcp			# RSVP Port
-prsvp		3455/udp			# RSVP Port
-distcc		3632/tcp			# distcc
-svn		3690/tcp			# Subversion
-svn		3690/udp			# Subversion
-postgres	5432/tcp			# POSTGRES
-postgres	5432/udp			# POSTGRES
-fax		4557/tcp			# FAX transmission service        (old)
-hylafax		4559/tcp			# HylaFAX client-server protocol  (new)
-xmpp		5222/tcp			# Jabber, plaintext
-xmpps		5223/tcp			# Jabber, SSL
-xmpps2s		5269/tcp			# Jabber Server-to-Server
-sgi-dgl		5232/tcp			# SGI Distributed Graphics
-sgi-dgl		5232/udp
+afbackup	2988/udp
+afmbackup	2989/tcp			# Afmbackup system
+afmbackup	2989/udp
+xtell		4224/tcp			# xtell server
+fax		4557/tcp			# FAX transmission service (old)
+hylafax		4559/tcp			# HylaFAX client-server protocol (new)
+distmp3		4600/tcp			# distmp3host daemon
+munin		4949/tcp	lrrd		# Munin
+enbd-cstatd	5051/tcp			# ENBD client statd
+enbd-sstatd	5052/tcp			# ENBD server statd
+pcrd		5151/tcp			# PCR-1000 Daemon
 noclog		5354/tcp			# noclogd with TCP (nocol)
 noclog		5354/udp			# noclogd with UDP (nocol)
 hostmon		5355/tcp			# hostmon uses TCP (nocol)
-hostmon		5355/udp			# hostmon uses TCP (nocol)
-canna		5680/tcp
-x11-ssh-offset	6010/tcp			# SSH X11 forwarding offset
+hostmon		5355/udp			# hostmon uses UDP (nocol)
+rplay		5555/udp			# RPlay audio service
+nsca		5667/tcp			# Nagios Agent - NSCA
+mrtd		5674/tcp			# MRT Routing Daemon
+bgpsim		5675/tcp			# MRT Routing Simulator
+canna		5680/tcp			# cannaserver
+sane-port	6566/tcp	sane saned	# SANE network scanner daemon
 ircd		6667/tcp			# Internet Relay Chat
-ircd		6667/udp			# Internet Relay Chat
-torrent		6881/tcp			# bittorrent
-xfs		7100/tcp			# X font server
-tircproxy	7666/tcp			# Tircproxy
-http-alt	8008/tcp
-http-alt	8008/udp
-webcache	8080/tcp			# WWW caching service
-webcache	8080/udp			# WWW caching service
+zope-ftp	8021/tcp			# zope management by ftp
 tproxy		8081/tcp			# Transparent Proxy
-tproxy		8081/udp			# Transparent Proxy
-jetdirect	9100/tcp	laserjet hplj	#
+omniorb		8088/tcp			# OmniORB
+omniorb		8088/udp
+clc-build-daemon 8990/tcp			# Common lisp build daemon
+xinetd		9098/tcp
 mandelspawn	9359/udp	mandelbrot	# network mandelbrot
+git		9418/tcp			# Git Version Control System
+zope		9673/tcp			# zope server
+webmin		10000/tcp
 kamanda		10081/tcp			# amanda backup services (Kerberos)
-kamanda		10081/udp			# amanda backup services (Kerberos)
+kamanda		10081/udp
 amandaidx	10082/tcp			# amanda backup services
 amidxtape	10083/tcp			# amanda backup services
+smsqp		11201/tcp			# Alamin SMS gateway
+smsqp		11201/udp
+xpilot		15345/tcp			# XPilot Contact Port
+xpilot		15345/udp
+sgi-cmsd	17001/udp		# Cluster membership services daemon
+sgi-crsd	17002/udp
+sgi-gcd		17003/udp			# SGI Group membership daemon
+sgi-cad		17004/tcp			# Cluster Admin daemon
 isdnlog		20011/tcp			# isdn logging system
-isdnlog		20011/udp			# isdn logging system
+isdnlog		20011/udp
 vboxd		20012/tcp			# voice box system
-vboxd		20012/udp			# voice box system
-wnn4_Kr		22305/tcp			# used by the kWnn package
-wnn4_Cn		22289/tcp			# used by the cWnn package
-wnn4_Tw		22321/tcp			# used by the tWnn package
-binkp		24554/tcp			# Binkley
-binkp		24554/udp			# Binkley
+vboxd		20012/udp
+binkp		24554/tcp			# binkp fidonet protocol
 asp		27374/tcp			# Address Search Protocol
-asp		27374/udp			# Address Search Protocol
-tfido		60177/tcp			# Ifmail
-tfido		60177/udp			# Ifmail
-fido		60179/tcp			# Ifmail
-fido		60179/udp			# Ifmail
+asp		27374/udp
+csync2		30865/tcp			# cluster synchronization tool
+dircproxy	57000/tcp			# Detachable IRC Proxy
+tfido		60177/tcp			# fidonet EMSI over telnet
+fido		60179/tcp			# fidonet EMSI over TCP
 
 # Local services
-