diff --git a/src/etc/daily b/src/etc/daily
index c0d3a051..279a7345 100644
--- a/src/etc/daily
+++ b/src/etc/daily
@@ -28,18 +28,13 @@ if [ -d /var/tmp -a ! -h /var/tmp ]; then
 	    >/dev/null 2>&1; }
 fi
 
-if [ -d /scratch -a ! -h /scratch ]; then
-	cd /scratch && {
-	find . ! -name . -atime +1 -exec rm -f -- {} \;
-	find . ! -name . -type d -mtime +1 -exec rmdir -- {} \; \
-	    >/dev/null 2>&1; }
-fi
-
-# XXX should go away/be replaced by nvi version
-if [ -d /var/preserve -a ! -h /var/preserve ]; then
-	cd /var/preserve && {
-	find . ! -name . -mtime +7 -exec rm -f -- {} \; ; }
-fi
+# Additional junk directory cleanup would go like this:
+#if [ -d /scratch -a ! -h /scratch ]; then
+#	cd /scratch && {
+#	find . ! -name . -atime +1 -exec rm -f -- {} \;
+#	find . ! -name . -type d -mtime +1 -exec rmdir -- {} \; \
+#	    >/dev/null 2>&1; }
+#fi
 
 if [ -d /var/rwho -a ! -h /var/rwho ] ; then
 	cd /var/rwho && {
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index f900720c..cb0759c6 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.5 1996/03/28 18:24:37 niklas Exp $
-#	$NetBSD: MAKEDEV,v 1.19 1996/03/02 13:58:04 veego Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 1996/04/23 03:18:37 deraadt Exp $
+#	$NetBSD: MAKEDEV,v 1.20 1996/04/13 01:02:18 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -251,8 +251,9 @@ cd*)
 	case $unit in
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}a   b $blk `expr $unit '*' 8 + 0`
-		mknod ${name}${unit}d   b $blk `expr $unit '*' 8 + 3`
+		mknod ${name}${unit}c   b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
+		mknod r${name}${unit}c  c $chr `expr $unit '*' 8 + 2`
 		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index 29397bc7..a7b99e9f 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.7 1996/01/11 21:34:48 leo Exp $
+#	$NetBSD: MAKEDEV,v 1.8 1996/03/27 14:27:53 leo Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -61,6 +61,9 @@
 # Pointing devices:
 #	mouse*	Atari mice
 #
+# Printer:
+#	lpt0	centronics printer
+#
 # Terminal ports:
 #	ser02	serial2 port (channel A on 8530)
 #	mdm02	modem2 port (channel B on 8530)
@@ -89,7 +92,7 @@ all)
 	sh MAKEDEV vnd3 vnd4 view00 view01 view02 view03 view04 view05 pty0 
 	sh MAKEDEV vnd5 vnd6 cd0 fd0 fd1 fd2 fd3 bpf0 bpf1 bpf2 bpf3
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
-	sh MAKEDEV tun0 tun1 lkm ser02 mdm02 local
+	sh MAKEDEV tun0 tun1 lkm ser02 mdm02 lpt0 local
 	;;
 
 floppy)
@@ -364,6 +367,13 @@ pty*)
 	esac
 	;;
 
+lpt*)
+	unit=`expr $i : 'lpt\(.*\)'`
+	rm -f lpt$unit
+	mknod lpt$unit c 29 $unit
+	chown root.wheel lpt$unit
+	;;
+
 bpf*)
 	unit=`expr $i : 'bpf\(.*\)'`
 	rm -f bpf$unit
diff --git a/src/etc/etc.hp300/Makefile.inc b/src/etc/etc.hp300/Makefile.inc
index 3f51f795..468c468a 100644
--- a/src/etc/etc.hp300/Makefile.inc
+++ b/src/etc/etc.hp300/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1 1995/09/06 16:17:41 thorpej Exp $
+#	$NetBSD: Makefile.inc,v 1.2 1996/03/22 05:14:27 scottr Exp $
 #
 #	etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
 
@@ -20,9 +20,9 @@ netbsd-dl:
 	    ${DESTDIR}/snapshot/netbsd-dl
 
 netbsd-gen.gz: netbsd-gen
-	gzip -9 ${DESTDIR}/snapshot/netbsd-gen
+	gzip -f9 ${DESTDIR}/snapshot/netbsd-gen
 
 netbsd-dl.gz: netbsd-dl
-	gzip -9 ${DESTDIR}/snapshot/netbsd-dl
+	gzip -f9 ${DESTDIR}/snapshot/netbsd-dl
 
 .endif	# DESTDIR check
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index a73d9b8f..cafbfe58 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,5 +1,7 @@
 #!/bin/sh -
 #
+#	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
+#
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
 #
@@ -39,6 +41,7 @@
 #	cd*	SCSI CD-ROM
 #	mcd*	Mitsumi CD-ROM
 #	vnd*	"file" pseudo-disks
+#	rd*	"ramdisk" pseudo-disks
 #	ccd*	contatenated disk devices
 #
 # Console ports:
@@ -86,7 +89,7 @@ all)
 	sh MAKEDEV st0 st1 ch0 cd0 cd1 mcd0 vnd0 vnd1 lpa0 lpa1
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV lpt0 lpt1 lpt2 ttyv0 bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2
-	sh MAKEDEV speaker lkm mms0 lms0 pms0 audio local joy0 joy1
+	sh MAKEDEV speaker lkm mms0 lms0 pms0 audio joy0 joy1 local
 # MISSING:
 #	sh MAKEDEV mouse-?
 	;;
@@ -151,6 +154,15 @@ wt*)
 	umask 77
 	;;
 
+rd*)
+	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
+	mknod rd${unit} b 17 $unit
+#	mknod rrd${unit} c 9 $unit
+	chgrp operator rd${unit} rrd${unit}
+	chmod 640 rd${unit} rrd${unit}
+	umask 77
+	;;
+
 ccd*|fd*|sd*|vnd*|wd*)
 	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
 	case $i in
@@ -362,7 +374,15 @@ pcmcia*)
 	chmod 700 pcmcia
 	chmod 600 pcmcia/*
 	;;
-	
+
+joy*)
+	unit=`expr $i : 'joy\(.*\)'`
+	rm -f joy$unit
+	mknod joy$unit c 26 $unit
+	chown root.wheel joy$unit
+	chmod 666 joy$unit
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.svr4/SVR4_MAKEDEV b/src/etc/etc.svr4/SVR4_MAKEDEV
index 9f64461a..8621e6e4 100644
--- a/src/etc/etc.svr4/SVR4_MAKEDEV
+++ b/src/etc/etc.svr4/SVR4_MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#     $NetBSD: SVR4_MAKEDEV,v 1.2 1996/02/10 18:14:11 christos Exp $
+#	$NetBSD: SVR4_MAKEDEV,v 1.3 1996/04/11 12:59:45 christos Exp $
 #
 # Copyright (c) 1995 Christos Zoulas
 # All rights reserved.
@@ -31,7 +31,10 @@
 # Network:
 #	udp		UDP socket creation
 #	tcp		TCP socket creation
-#	ticotsord	XXX: tcp for now
+#	rawip		RAW socket creation
+#	ticlts		UNIX datagram creation
+#	ticotsord	UNIX stream creation (with orderly release)
+#	ticots		UNIX stream creation
 # Various:
 #	wabi		Windows emulation; /dev/null for now
 #
@@ -47,7 +50,7 @@ unit=`expr $i : '[a-z][a-z]*\([0-9][0-9]*\)'`
 case $i in
 
 all)
-      sh $0 tcp udp wabi ticotsord
+	sh SVR4_MAKEDEV tcp udp rawip ticlts ticotsord ticots wabi
 	;;
 tcp)
 	mknod $i		c 43 35
@@ -55,18 +58,40 @@ tcp)
 	chmod 666 $i
 	;;
 
+
 udp)
 	mknod udp		c 43 36
 	chown bin.bin $i
 	chmod 666 $i
 	;;
-wabi)
-	mknod $i		c 3 2	# /dev/null
+
+rawip)
+	mknod $i		c 43 37
+	chown bin.bin $i
+	chmod 666 $i
+	;;
+
+ticlts)
+	mknod $i		c 43 38
 	chown bin.bin $i
 	chmod 666 $i
 	;;
+
 ticotsord)
-	mknod $i		c 43 35	# /dev/tcp
+	mknod $i		c 43 39
+	chown bin.bin $i
+	chmod 666 $i
+	;;
+
+ticots)
+	mknod $i		c 43 40
+	chown bin.bin $i
+	chmod 666 $i
+	;;
+
+
+wabi)
+	mknod $i		c 3 2	# /dev/null
 	chown bin.bin $i
 	chmod 666 $i
 	;;
diff --git a/src/etc/etc.svr4/netconfig b/src/etc/etc.svr4/netconfig
index 21830244..625c6da6 100644
--- a/src/etc/etc.svr4/netconfig
+++ b/src/etc/etc.svr4/netconfig
@@ -1,7 +1,10 @@
-#	$NetBSD: netconfig,v 1.1 1995/07/02 06:29:49 christos Exp $
+#	$NetBSD: netconfig,v 1.2 1996/04/11 12:59:47 christos Exp $
 # SVR4 Network configuration file
 #
-# service name	       fl family  proto  device		library
-udp       tpi_clts     v inet     udp    /dev/udp       -
-tcp       tpi_cots_ord v inet     tcp    /dev/tcp       -
-ticotsord tpi_cots_ord v loopback -      /dev/ticotsord straddr.so
+# service name	       fl family   proto device         library
+udp       tpi_clts     v  inet     udp   /dev/udp       -
+tcp       tpi_cots_ord v  inet     tcp   /dev/tcp       -
+rawip     tpi_raw      -  inet     -     /dev/rawip     -
+ticlts    tpi_clts     v  loopback -     /dev/ticlts    straddr.so
+ticotsord tpi_cots_ord v  loopback -     /dev/ticotsord straddr.so
+ticots    tpi_cots     v  loopback -     /dev/ticots    straddr.so
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 9d7561c4..d9191e21 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,5 +1,5 @@
 #	from: @(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
-#	$Id: 4.4BSD.dist,v 1.11 1996/03/25 23:59:13 niklas Exp $
+#	$Id: 4.4BSD.dist,v 1.12 1996/04/23 03:18:46 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -514,9 +514,9 @@ vax
 # ./usr/share/doc/smm/02.config
 ..
 
-# ./usr/share/doc/smm/03.fsck
-03.fsck
-# ./usr/share/doc/smm/03.fsck
+# ./usr/share/doc/smm/03.fsck_ffs
+03.fsck_ffs
+# ./usr/share/doc/smm/03.fsck_ffs
 ..
 
 # ./usr/share/doc/smm/04.quotas
@@ -927,6 +927,11 @@ amiga
 # ./usr/share/man/cat4/amiga
 ..
 
+# ./usr/share/man/cat4/arm32
+arm32
+# ./usr/share/man/cat4/arm32
+..
+
 # ./usr/share/man/cat4/atari
 atari
 # ./usr/share/man/cat4/atari
@@ -998,6 +1003,11 @@ amiga
 # ./usr/share/man/cat8/amiga
 ..
 
+# ./usr/share/man/cat8/arm32
+arm32
+# ./usr/share/man/cat8/arm32
+..
+
 # ./usr/share/man/cat8/atari
 atari
 # ./usr/share/man/cat8/atari
@@ -1079,6 +1089,11 @@ amiga
 # ./usr/share/man/man4/amiga
 ..
 
+# ./usr/share/man/man4/arm32
+arm32
+# ./usr/share/man/man4/arm32
+..
+
 # ./usr/share/man/man4/atari
 atari
 # ./usr/share/man/man4/atari
@@ -1150,6 +1165,11 @@ amiga
 # ./usr/share/man/man8/amiga
 ..
 
+# ./usr/share/man/man8/arm32
+arm32
+# ./usr/share/man/man8/arm32
+..
+
 # ./usr/share/man/man8/atari
 atari
 # ./usr/share/man/man8/atari
diff --git a/src/etc/mtree/4.4BSD.usr b/src/etc/mtree/4.4BSD.usr
index b92e8335..d3d6da23 100644
--- a/src/etc/mtree/4.4BSD.usr
+++ b/src/etc/mtree/4.4BSD.usr
@@ -898,10 +898,10 @@ vax             type=dir uname=root gname=wheel mode=0775
 ..
 
 
-# ./share/doc/smm/03.fsck
+# ./share/doc/smm/03.fsck_ffs
 /set type=file gname=bin uname=bin mode=0444
 03.fsck         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/smm/03.fsck
+# ./share/doc/smm/03.fsck_ffs
 ..
 
 
diff --git a/src/etc/rc b/src/etc/rc
index ad7e7b51..46bd7941 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -216,9 +216,10 @@ echo -n ' printer';		lpd
 
 # $sendmail_flags is imported from /etc/netstart;
 # If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then
-# sendmail isn't run.
+# sendmail isn't run.  We call sendmail with a full path so that
+# SIGHUP works.
 if [ "X${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
-	echo -n ' sendmail';		sendmail ${sendmail_flags}
+	echo -n ' sendmail';		/usr/sbin/sendmail ${sendmail_flags}
 fi
 
 echo -n ' inetd';		inetd
diff --git a/src/etc/services b/src/etc/services
index a3e05b3b..df0bed7e 100644
--- a/src/etc/services
+++ b/src/etc/services
@@ -1,5 +1,5 @@
-#	$OpenBSD: services,v 1.3 1996/03/28 18:24:34 niklas Exp $
-#	$NetBSD: services,v 1.17 1996/02/25 02:19:56 ghudson Exp $
+#	$OpenBSD: services,v 1.4 1996/04/23 03:18:35 deraadt Exp $
+#	$NetBSD: services,v 1.18 1996/03/26 00:07:58 mrg Exp $
 #
 # Network services, Internet style
 #
@@ -27,7 +27,8 @@ chargen		19/tcp		ttytst source
 chargen		19/udp		ttytst source
 ftp-data	20/tcp		# default ftp data port
 ftp		21/tcp
-# 22 - unassigned
+ssh		22/tcp
+ssh		22/udp
 telnet		23/tcp
 # 24 - private
 smtp		25/tcp		mail