diff --git a/src/etc/daily b/src/etc/daily
index 785b734a..9dc4bc1f 100644
--- a/src/etc/daily
+++ b/src/etc/daily
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: daily,v 1.38 2001/10/29 18:16:23 millert Exp $
+#	$OpenBSD: daily,v 1.39 2001/11/19 03:03:33 deraadt Exp $
 #	From: @(#)daily	8.2 (Berkeley) 1/25/94
 #
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
@@ -170,7 +170,7 @@ if [ -f /etc/Distfile ]; then
 		logf=`date +%Y.%b.%e`
 		rdist -f /etc/Distfile 2>&1 | tee /var/log/rdist/$logf
 	else
-		rdist -f /etc/Distfile 
+		rdist -f /etc/Distfile
 	fi
 fi
 
diff --git a/src/etc/ksh.kshrc b/src/etc/ksh.kshrc
index e05dd2da..110d0891 100644
--- a/src/etc/ksh.kshrc
+++ b/src/etc/ksh.kshrc
@@ -1,8 +1,8 @@
 :
-#	$OpenBSD: ksh.kshrc,v 1.7 2001/04/30 18:24:21 marc Exp $
+#	$OpenBSD: ksh.kshrc,v 1.8 2001/11/19 03:03:33 deraadt Exp $
 #
 # NAME:
-#	ksh.kshrc - global initialization for ksh 
+#	ksh.kshrc - global initialization for ksh
 #
 # DESCRIPTION:
 #	Each invocation of /bin/ksh processes the file pointed
@@ -26,9 +26,9 @@
 #	This file is provided in the hope that it will
 #	be of use.  There is absolutely NO WARRANTY.
 #	Permission to copy, redistribute or otherwise
-#	use this file is hereby granted provided that 
+#	use this file is hereby granted provided that
 #	the above copyright notice and this notice are
-#	left intact. 
+#	left intact.
 
 case "$-" in
 *i*)	# we are interactive
@@ -55,7 +55,7 @@ case "$-" in
 	tty=`tty`
 	tty=`basename $tty`
         TTY=${TTY:-$tty}
- 
+
 	set -o emacs
 
 	alias ls='ls -CF'
@@ -153,13 +153,13 @@ case "$-" in
 		alias df='df -k'
 		alias du='du -k'
 		;;
-	esac	
+	esac
 	alias rsize='eval `resize`'
 
 	case "$TERM" in
 	sun*|xterm*)
 		case $tty in
-		tty[p-w]*)		
+		tty[p-w]*)
 			case "$DISPLAY" in
 			"")
 				DISPLAY="`who | grep $TTY | sed -n 's/.*(\([^:)]*\)[:)].*/\1/p' | sed 's/\([a-zA-Z][^.]*\).*/\1/'`:0"
@@ -203,6 +203,6 @@ pre_path () {
 }
 # if $1 is in path, remove it
 del_path () {
-  no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: | 
+  no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: |
     sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;"`
 }
diff --git a/src/etc/login.conf b/src/etc/login.conf
index 0aaa1d28..1e9bc41f 100644
--- a/src/etc/login.conf
+++ b/src/etc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.9 2001/08/09 15:45:24 millert Exp $
+# $OpenBSD: login.conf,v 1.10 2001/11/19 03:03:33 deraadt Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -30,7 +30,7 @@ auth-defaults:auth=krb4-or-pwd,krb4,krb5-or-pwd,krb5,passwd,skey,activ,crypto,sn
 # Default authentication methods for ftp (krb4-or-pwd by default)
 auth-ftp-defaults:auth-ftp=krb4-or-pwd,krb4,krb5-or-pwd,krb5,passwd,skey,activ,crypto,snk,token:
 
-# 
+#
 # The default values
 # To alter the default authentication types change the line:
 #	:tc=auth-defaults:\
diff --git a/src/etc/mrouted.conf b/src/etc/mrouted.conf
index 905b59ee..6cd21c7e 100644
--- a/src/etc/mrouted.conf
+++ b/src/etc/mrouted.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mrouted.conf,v 1.5 1996/07/20 00:15:54 deraadt Exp $
+#	$OpenBSD: mrouted.conf,v 1.6 2001/11/19 03:03:33 deraadt Exp $
 #
 #   This is the configuration file for "mrouted", an IP multicast router.
 #   mrouted looks for it in "/etc/mrouted.conf".
@@ -10,11 +10,11 @@
 # pruning on
 #
 # phyint <local-addr> [disable] [metric <m>] [threshold <t>] [rate_limit <b>]
-#                         [boundary (<boundname>|<scoped-addr>/<mask-len>)]
-#			  [altnet (<subnet>/<mask-len>|<subnet>)]
-# tunnel <local-addr> <remote-addr> [srcrt] [metric <m>] 
-#                                      [threshold <t>] [rate_limit <b>]
-#                         [boundary (<boundname>|<scoped-addr>/<mask-len>)]
+#        [boundary (<boundname>|<scoped-addr>/<mask-len>)]
+#	 [altnet (<subnet>/<mask-len>|<subnet>)]
+# tunnel <local-addr> <remote-addr> [srcrt] [metric <m>]
+#        [threshold <t>] [rate_limit <b>]
+#        [boundary (<boundname>|<scoped-addr>/<mask-len>)]
 #
 #   NOTE: any phyint commands MUST precede any tunnel commands
 #   NOTE: the mask-len is the no. of leading 1's in the mask
diff --git a/src/etc/protocols b/src/etc/protocols
index ff73a7be..11f31fa7 100644
--- a/src/etc/protocols
+++ b/src/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet (IP) protocols
 #
-#	$OpenBSD: protocols,v 1.12 2000/12/21 14:48:26 reinhard Exp $
+#	$OpenBSD: protocols,v 1.13 2001/11/19 03:03:33 deraadt Exp $
 #
 # Updated based on RFC 1340, Assigned Numbers (July 1992).
 # See also http://www.isi.edu/in-notes/iana/assignments/protocol-numbers
@@ -109,4 +109,4 @@ gmtp	100	GMTP		# GMTP
 pim	103	PIM		# Protocol Independent Multicast
 ipcomp	108	IPComp		# IP Payload Compression Protocol
 vrrp	112	VRRP		# Virtual Router Redundancy Protocol
-reserved 255	Reserved	# 
+reserved 255	Reserved	#
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index b9b08e68..2e555a95 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.70 2001/10/12 22:40:58 jakob Exp $
+#	$OpenBSD: rc.conf,v 1.71 2001/11/19 03:03:33 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -11,8 +11,8 @@ rarpd_flags=NO		# for normal use: "-a"
 bootparamd_flags=NO	# for normal use: ""
 rbootd_flags=NO		# for normal use: ""
 sshd_flags=""		# for normal use: ""
-smtpfwdd_flags=NO	# for normal use: ""; be sure to configure smtpd(8)     
-			# and sendmail(8) to use MSA only                       
+smtpfwdd_flags=NO	# for normal use: ""; be sure to configure smtpd(8)
+			# and sendmail(8) to use MSA only
 named_flags=NO		# for normal use: ""
 rdate_flags=NO		# for normal use: name of RFC868 timeserver
 timed_flags=NO		# for normal use: ""
diff --git a/src/etc/remote b/src/etc/remote
index db8669d3..b50813d6 100644
--- a/src/etc/remote
+++ b/src/etc/remote
@@ -36,9 +36,9 @@
 #       a) Multiple :tc=XXX: capabilities are allowed, so that
 #          various general pieces can be assembled into one
 #          system description.
-#       b) Only the first capability with the same name is 
+#       b) Only the first capability with the same name is
 #          used. So capabilitites included a with :tc=XXX: can
-#          be overridden by assigning them a value before 
+#          be overridden by assigning them a value before
 #          including them. e.g. ":oe=^Z:" in doshost below.
 #
 # See cgetcap(3) for details on capability databases.
diff --git a/src/etc/rpc b/src/etc/rpc
index dd805368..b7ad254c 100644
--- a/src/etc/rpc
+++ b/src/etc/rpc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: rpc,v 1.2 1996/05/26 10:25:29 deraadt Exp $
+#	$OpenBSD: rpc,v 1.3 2001/11/19 03:03:33 deraadt Exp $
 # from: rpc 88/08/01 4.0 RPCSRC; from 1.12   88/02/07 SMI
 #
 portmapper	100000	portmap sunrpc
@@ -29,7 +29,7 @@ status		100024
 bootparam	100026
 ypupdated	100028	ypupdate
 keyserv		100029	keyserver
-tfsd		100037 
+tfsd		100037
 nsed		100038
 nsemntd		100039
 pcnfsd		150001	pcnfs
diff --git a/src/etc/services b/src/etc/services
index 6b87ac5b..86afbe9a 100644
--- a/src/etc/services
+++ b/src/etc/services
@@ -1,4 +1,4 @@
-#	$OpenBSD: services,v 1.36 2001/10/24 03:27:32 mickey Exp $
+#	$OpenBSD: services,v 1.37 2001/11/19 03:03:33 deraadt Exp $
 #
 # Network services, Internet style
 #
@@ -223,7 +223,7 @@ rkinit		2108/tcp			# Kerberos remote kinit
 kx		2111/tcp			# X over kerberos
 kip		2112/tcp			# IP over kerberos
 kauth		2120/tcp			# Remote kauth
-# 
+#
 # AFS Services
 #
 afs3-fileserver		7000/udp	# AFS fileserver