===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/services,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
*** src/etc/services	2014/07/12 14:51:07	1.87
--- src/etc/services	2014/07/15 15:52:38	1.88
***************
*** 1,4 ****
! # $OpenBSD: services,v 1.87 2014/07/12 14:51:07 ajacoutot Exp $
  #
  # Network services, Internet style
  # https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
--- 1,4 ----
! # $OpenBSD: services,v 1.88 2014/07/15 15:52:38 sthen Exp $
  #
  # Network services, Internet style
  # https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt
***************
*** 286,292 ****
  kerberos_master	751/tcp				# Kerberos 4 kadmin
  krb_prop	754/tcp		hprop		# Kerberos slave propagation
  krbupdate	760/tcp		kreg		# BSD Kerberos registration
- conserver	782/tcp				# console server
  supfilesrv	871/tcp				# SUP server
  swat		901/tcp				# Samba Web Administration Tool
  supfiledbg	1127/tcp			# SUP debugging
--- 286,291 ----
***************
*** 294,299 ****
--- 293,299 ----
  datametrics	1645/udp
  ekshell2	2106/tcp			# Encrypted kshell - UColorado, Boulder
  webster		2627/tcp			# Network dictionary
+ conserver	3109/tcp			# console server
  canna		5680/tcp			# Kana->Kanji server
  sane-port	6566/tcp			# SANE Control Port
  icb		7326/tcp			# Internet Citizen's Band