diff --git a/src/etc/etc.amiga/ttys b/src/etc/etc.amiga/ttys
index 1e81a330..92c69887 100644
--- a/src/etc/etc.amiga/ttys
+++ b/src/etc/etc.amiga/ttys
@@ -1,18 +1,18 @@
 #
-#	$OpenBSD: ttys,v 1.7 1998/06/28 03:26:51 todd Exp $
+#	$OpenBSD: ttys,v 1.8 2002/05/30 06:46:13 deraadt Exp $
 #
 # name	getty				type	status		comments
 #
 # If the console is marked insecure, single-user requires
 # the root password.
 console	"/usr/libexec/getty Pc"		vt220	off secure 
-ttye0	"/usr/libexec/getty Pc"		vt220	on  secure 	# custom chips
-ttye1	"/usr/libexec/getty Pc"		vt220	on  secure 	# retina
-ttye2	"/usr/libexec/getty Pc"		vt220	on  secure 	# retina
-ttye3	"/usr/libexec/getty Pc"		vt220	on  secure 	# cirrus logic
-ttye4	"/usr/libexec/getty Pc"		vt220	on  secure 	# a2410
-ttye5	"/usr/libexec/getty Pc"		vt220	on  secure 	# CyberVision64
-ttye6	"/usr/libexec/getty Pc"		vt220	on  secure 	# Domino, Merlin, oMniBus
+ttye0	"/usr/libexec/getty Pc"		vt220	on  secure	# custom chips
+ttye1	"/usr/libexec/getty Pc"		vt220	on  secure	# retina
+ttye2	"/usr/libexec/getty Pc"		vt220	on  secure	# retina
+ttye3	"/usr/libexec/getty Pc"		vt220	on  secure	# cirrus logic
+ttye4	"/usr/libexec/getty Pc"		vt220	on  secure	# a2410
+ttye5	"/usr/libexec/getty Pc"		vt220	on  secure	# CyberVision64
+ttye6	"/usr/libexec/getty Pc"		vt220	on  secure	# Domino, Merlin, oMniBus
 tty00	"/usr/libexec/getty std.9600"	unknown off secure	# int. serial
 ttyB0	"/usr/libexec/getty std.9600"	unknown off secure	# ISA serial
 ttyB1	"/usr/libexec/getty std.9600"	unknown off secure	# ISA serial
diff --git a/src/etc/etc.mvme68k/ttys b/src/etc/etc.mvme68k/ttys
index 92040dd6..9ee6a8ef 100644
--- a/src/etc/etc.mvme68k/ttys
+++ b/src/etc/etc.mvme68k/ttys
@@ -1,12 +1,12 @@
 #
-#	$OpenBSD: ttys,v 1.6 2000/01/24 05:03:50 smurph Exp $
+#	$OpenBSD: ttys,v 1.7 2002/05/30 06:46:13 deraadt Exp $
 #
 # name	getty				type	status		comments
 #
 # If the console is marked insecure, single-user requires
 # the root password.
 console	"/usr/libexec/getty Pc"		unknown	on   secure
-ttya	"/usr/libexec/getty Pc"		unknown	off  secure 	# 147/162 console
+ttya	"/usr/libexec/getty Pc"		unknown	off  secure	# 147/162 console
 ttyb	"/usr/libexec/getty Pc"		unknown	off
 ttyc	"/usr/libexec/getty Pc"		unknown	off
 ttyd	"/usr/libexec/getty Pc"		unknown	off
diff --git a/src/etc/etc.mvmeppc/MAKEDEV b/src/etc/etc.mvmeppc/MAKEDEV
index 4f5f3f8b..f2984ced 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV
+++ b/src/etc/etc.mvmeppc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.6 2002/05/21 01:41:56 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 2002/05/30 06:46:13 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -219,7 +219,7 @@ sd*|wd*|ccd*|ofdisk*|raid*)
 	sd*) name=sd;		blk=2;	chr=8;;
 	wd*) name=wd;		blk=0;	chr=11;;
 	ofdisk*) name=ofdisk;	blk=4;	chr=13;;
-	ccd*) name=ccd; 	blk=16;	chr=18;;
+	ccd*) name=ccd;		blk=16;	chr=18;;
 	raid*) name=raid;	blk=19;	chr=54;;
 	esac
 	rm -f $name$unit? r$name$unit?
diff --git a/src/etc/etc.mvmeppc/MAKEDEV.md b/src/etc/etc.mvmeppc/MAKEDEV.md
index 8b769d2e..e99330ed 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV.md
+++ b/src/etc/etc.mvmeppc/MAKEDEV.md
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV.md,v 1.5 2002/05/21 01:41:04 deraadt Exp $
+#	$OpenBSD: MAKEDEV.md,v 1.6 2002/05/30 06:46:13 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -83,7 +83,7 @@ sd*|wd*|ccd*|ofdisk*|raid*)
 	sd*) name=sd;		blk=2;	chr=8;;
 	wd*) name=wd;		blk=0;	chr=11;;
 	ofdisk*) name=ofdisk;	blk=4;	chr=13;;
-	ccd*) name=ccd; 	blk=16;	chr=18;;
+	ccd*) name=ccd;		blk=16;	chr=18;;
 	raid*) name=raid;	blk=19;	chr=54;;
 	esac
 	rm -f $name$unit? r$name$unit?
diff --git a/src/etc/inetd.conf b/src/etc/inetd.conf
index c8d5f45a..1c9383fc 100644
--- a/src/etc/inetd.conf
+++ b/src/etc/inetd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: inetd.conf,v 1.45 2002/05/24 00:51:21 deraadt Exp $
+#	$OpenBSD: inetd.conf,v 1.46 2002/05/30 06:44:07 deraadt Exp $
 #
 # Internet server configuration database
 #
@@ -44,7 +44,7 @@ time		stream	tcp6	nowait	root	internal
 #time		dgram	udp	wait	root	internal
 #time		dgram	udp6	wait	root	internal
 # Kerberos authenticated services
-#kshell		stream	tcp	nowait	root	/usr/libexec/rshd 	rshd -k
+#kshell		stream	tcp	nowait	root	/usr/libexec/rshd	rshd -k
 #ekshell	stream	tcp	nowait	root	/usr/libexec/rshd	rshd -Lk
 #ekshell2	stream	tcp	nowait	root	/usr/libexec/rshd	rshd -Lk
 #kauth		stream	tcp	nowait	root	/usr/libexec/kauthd	kauthd
diff --git a/src/etc/ksh.kshrc b/src/etc/ksh.kshrc
index 110d0891..fb0eade0 100644
--- a/src/etc/ksh.kshrc
+++ b/src/etc/ksh.kshrc
@@ -1,5 +1,5 @@
 :
-#	$OpenBSD: ksh.kshrc,v 1.8 2001/11/19 03:03:33 deraadt Exp $
+#	$OpenBSD: ksh.kshrc,v 1.9 2002/05/30 06:44:07 deraadt Exp $
 #
 # NAME:
 #	ksh.kshrc - global initialization for ksh
@@ -147,7 +147,7 @@ case "$-" in
 	OS=${OS:-`uname -s`}
 	case $OS in
 	HP-UX)
-        	alias ls='ls -CF'
+		alias ls='ls -CF'
                 ;;
 	*BSD)
 		alias df='df -k'
diff --git a/src/etc/mtree/BSD.local.dist b/src/etc/mtree/BSD.local.dist
index 97022c57..691c1ea2 100644
--- a/src/etc/mtree/BSD.local.dist
+++ b/src/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-#     $OpenBSD: BSD.local.dist,v 1.10 2002/04/16 19:02:19 espie Exp $
+#     $OpenBSD: BSD.local.dist,v 1.11 2002/05/30 06:46:13 deraadt Exp $
 #     $FreeBSD: BSD.local.dist,v 1.32 1997/09/12 05:44:11 asami Exp $
 #
 
@@ -174,7 +174,7 @@
             ..
 	    lt_LN.ISO_8859-1
 	    ..
-    	    lt_LN.ISO_8859-2
+	    lt_LN.ISO_8859-2
             ..
 	    nl_BE.ISO_8859-1
             ..
diff --git a/src/etc/newsyslog.conf b/src/etc/newsyslog.conf
index 73f1a2c5..3efae636 100644
--- a/src/etc/newsyslog.conf
+++ b/src/etc/newsyslog.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: newsyslog.conf,v 1.17 2001/09/21 17:59:21 beck Exp $
+#	$OpenBSD: newsyslog.conf,v 1.18 2002/05/30 06:44:07 deraadt Exp $
 #
 # configuration file for newsyslog
 #
@@ -18,8 +18,8 @@
 #
 # Uncomment to rotate apache logs
 #
-#/var/www/logs/access_log	 	644  7    250  *     Z /var/www/logs/httpd.pid SIGUSR1
-#/var/www/logs/error_log	 	644  7    250  *     Z /var/www/logs/httpd.pid SIGUSR1
+#/var/www/logs/access_log		644  7    250  *     Z /var/www/logs/httpd.pid SIGUSR1
+#/var/www/logs/error_log		644  7    250  *     Z /var/www/logs/httpd.pid SIGUSR1
 #
 # Uncomment to rotate ssl logs
 #
diff --git a/src/etc/protocols b/src/etc/protocols
index 11f31fa7..e225ae69 100644
--- a/src/etc/protocols
+++ b/src/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet (IP) protocols
 #
-#	$OpenBSD: protocols,v 1.13 2001/11/19 03:03:33 deraadt Exp $
+#	$OpenBSD: protocols,v 1.14 2002/05/30 06:44:07 deraadt Exp $
 #
 # Updated based on RFC 1340, Assigned Numbers (July 1992).
 # See also http://www.isi.edu/in-notes/iana/assignments/protocol-numbers
@@ -56,7 +56,7 @@ rsvp	46	RSVP		# Reservation Protocol
 gre	47	GRE		# General Routing Encapsulation
 mhrp	48	MHRP		# Mobile Host Routing Protocol
 bna	49	BNA		# BNA
-esp 	50	IPSEC-ESP	# Encap Security Payload
+esp	50	IPSEC-ESP	# Encap Security Payload
 ah	51	IPSEC-AH	# Authentication Header
 i-nlsp	52	I-NLSP		# Integrated Net Layer Security TUBA
 swipe	53	SWIPE		# IP with Encryption
diff --git a/src/etc/services b/src/etc/services
index 7504ce42..67f6980c 100644
--- a/src/etc/services
+++ b/src/etc/services
@@ -1,4 +1,4 @@
-#	$OpenBSD: services,v 1.41 2002/05/03 15:08:00 brad Exp $
+#	$OpenBSD: services,v 1.42 2002/05/30 06:44:07 deraadt Exp $
 #
 # Network services, Internet style
 #
@@ -87,8 +87,8 @@ 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 		# Internet Message Access Proto
-imap		143/udp		imap2 		# Internet Message Access Proto
+imap		143/tcp		imap2		# Internet Message Access Proto
+imap		143/udp		imap2		# Internet Message Access Proto
 bftp		152/tcp				# Background File Transfer Proto
 snmp		161/udp				# Simple Net Mgmt Proto
 snmp-trap	162/udp		snmptrap	# Traps for SNMP
@@ -134,7 +134,7 @@ photuris	468/tcp				# Photuris Key Management
 photuris	468/udp
 isakmp		500/udp				# ISAKMP key management
 kshell		544/tcp		krcmd		# Kerberos remote shell
-ekshell		545/tcp		      		# Kerberos encrypted shell
+ekshell		545/tcp				# Kerberos encrypted shell
 submission	587/tcp		msa		# mail message submission
 submission	587/udp		msa		# mail message submission
 #
@@ -229,15 +229,15 @@ kauth		2120/tcp			# Remote kauth
 # AFS Services
 #
 afs3-fileserver		7000/udp	# AFS fileserver
-afs3-callback       	7001/udp	# AFS callback server
-afs3-prserver       	7002/udp	# AFS protection server
+afs3-callback		7001/udp	# AFS callback server
+afs3-prserver		7002/udp	# AFS protection server
 afs3-vlserver		7003/udp	# AFS volumelocation server
-afs3-kaserver       	7004/udp	# AFS kerberos authentication server
-afs3-volser         	7005/udp	# AFS volume server
-afs3-errors         	7006/udp	# AFS error server ?
-afs3-bos            	7007/udp	# AFS basic over-see server ?
-afs3-update         	7008/udp	# AFS server to server update
-afs3-rmtsys         	7009/udp	# AFS remote cache manager service
+afs3-kaserver		7004/udp	# AFS kerberos authentication server
+afs3-volser		7005/udp	# AFS volume server
+afs3-errors		7006/udp	# AFS error server ?
+afs3-bos		7007/udp	# AFS basic over-see server ?
+afs3-update		7008/udp	# AFS server to server update
+afs3-rmtsys		7009/udp	# AFS remote cache manager service
 #
 # Unofficial services
 #