diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index aa0c6381..ba71e5fb 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.5 1996/06/23 10:07:24 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 1996/07/15 14:59:05 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -69,6 +69,8 @@
 #	mmclock	memory mapped clock
 #	kbd	keyboard (provides events, for X11)
 #	mouse	mouse (provides events, for X11)
+#	*rnd	inkernel random number generator
+#	uk*	unknown SCSI
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 umask 77
@@ -82,7 +84,7 @@ all)
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 tun3
 	sh MAKEDEV ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 lkm
-	sh MAKEDEV mmclock kbd mouse lpa0 lpt0
+	sh MAKEDEV mmclock kbd mouse lpa0 lpt0 rnd
 	sh MAKEDEV local
 	;;
 
@@ -272,6 +274,24 @@ lpt*|lpa*)
 	chown root.wheel $name$unit
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 33 0
+	mknod srnd c 33 1
+	mknod urnd c 33 2
+	mknod prnd c 33 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
+uk*)
+	unit=`expr $i : 'uk\(.*\)'`
+	rm -f uk$unit
+	mknod uk$unit c 32 $unit
+	chown root.operator uk$unit
+	chmod 640 uk$unit
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 8c37eaa9..bcd7c657 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.8 1996/05/27 07:51:23 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.9 1996/07/15 14:59:07 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -88,6 +88,8 @@
 #	tun*	network tunnel driver
 #	ipf	IP filter
 #	ss*	SCSI scanner
+#	uk*	unknown SCSI
+#	*rnd	random data source
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 umask 77
@@ -103,7 +105,7 @@ all)
 	sh MAKEDEV vnd5 vnd6 cd0 fd0 fd1 fd2 fd3 bpf0 bpf1 bpf2 bpf3
 	sh MAKEDEV lpa0 lpa1 lpt0 lpt1 lpt2 ipl
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
-	sh MAKEDEV tun0 tun1 par0 lkm ss0 local
+	sh MAKEDEV tun0 tun1 par0 lkm ss0 rnd local
 	;;
 
 floppy)
@@ -474,6 +476,24 @@ ss*)
 	chown root.wheel ss$unit
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 35 0
+	mknod srnd c 35 1
+	mknod urnd c 35 2
+	mknod prnd c 35 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
+uk*)
+	unit=`expr $i : 'uk\(.*\)'`
+	rm -f uk$unit
+	mknod uk$unit c 36 $unit
+	chown root.operator uk$unit
+	chmod 640 uk$unit
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index 69def1dd..11472e06 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -78,6 +78,7 @@
 #	ss*	SCSI scanner device
 #	iic*	IIC bus device
 #	rtc*	RTC device
+#	*rnd	random data source
 #
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -90,7 +91,7 @@ all)
 	sh MAKEDEV std fd fd0 fd1 wd0 wd1 rd0 rd1 sd0 sd1 sd2 tty0 tty1 pty0 pty1
 	sh MAKEDEV st0 st1 ch0 cd0 cd1 vnd0 vnd1 ccd0 ccd1 uk0 uk1 ss0
 	sh MAKEDEV ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7 ttyv8 ttyv9
-	sh MAKEDEV lpa0 lpt0 bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2
+	sh MAKEDEV lpa0 lpt0 bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 rnd
 	sh MAKEDEV beep lkm quadmouse local cpu0 cpu1 cpu2 cpu3 cpu4 cpu5
 	;;
 
@@ -345,6 +346,16 @@ cpu*)
 	;;
 
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 44 0
+	mknod srnd c 44 1
+	mknod urnd c 44 2
+	mknod prnd c 44 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index a7b99e9f..021caa3f 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -79,6 +79,7 @@
 #	lkm	loadable kernel modules interface.
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
+#	*rnd	random data source
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 umask 77
@@ -92,7 +93,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 lpt0 local
+	sh MAKEDEV tun0 tun1 lkm ser02 mdm02 lpt0 rnd local
 	;;
 
 floppy)
@@ -396,6 +397,16 @@ lkm)
         chmod 640 lkm
         ;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 30 0
+	mknod srnd c 30 1
+	mknod urnd c 30 2
+	mknod prnd c 30 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 4d8f619e..1ab5b03b 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -74,7 +74,7 @@ all)
 	sh MAKEDEV std fd ct0 ct1 st0 st1 ccd0 ccd1 ccd2 rd0 rd1 rd2
 	sh MAKEDEV sd0 sd1 sd2 pty0 vnd0 vnd1 vnd2 vnd3
 	sh MAKEDEV hil grf0 ite0 dca0 dcm0 dcm1 dcm2 dcm3
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2 tun3 lkm
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2 tun3 lkm rnd
 	sh MAKEDEV local
 	;;
 
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 597779ad..b26fbe55 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -443,8 +443,8 @@ uk*)
 	unit=`expr $i : 'uk\(.*\)'`
 	rm -f uk$unit
 	mknod uk$unit c 20 $unit
-	chown root.wheel uk$unit
-	chmod 600 uk$unit
+	chown root.operator uk$unit
+	chmod 640 uk$unit
 	;;
 	
 local)
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index f0eddbbc..b09a03a8 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -56,6 +56,7 @@
 #	bpf*	packet filter
 #	tun*	network tunnel driver
 #	lkm	Device to for loadable kernel modules
+#	*rnd	random data source
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin
@@ -69,12 +70,13 @@ all)
 	sh MAKEDEV sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
 	sh MAKEDEV vnd0 vnd1 vnd2 vnd3
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
-      sh MAKEDEV adb grf0 grf1 grf2 grf3 ttye0
+	sh MAKEDEV adb grf0 grf1 grf2 grf3 ttye0
 	sh MAKEDEV tty00 tty01 pty0
 	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
 	sh MAKEDEV bpf8 bpf9 bpfa bpfb ipl
 	sh MAKEDEV tun0 tun1 tun2 tun3
 	sh MAKEDEV lkm
+	sh MAKEDEV rnd
 	sh MAKEDEV local
 	;;
 
@@ -320,6 +322,16 @@ lkm)
 	chmod 640 lkm
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 33 0
+	mknod srnd c 33 1
+	mknod urnd c 33 2
+	mknod prnd c 33 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index a331ab4f..1d39c485 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -31,7 +31,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: MAKEDEV,v 1.6 1996/05/27 22:02:47 chuck Exp $
+#	$Id: MAKEDEV,v 1.7 1996/07/15 14:59:14 mickey Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -89,6 +89,7 @@ all)
 	sh MAKEDEV tun0 tun1 lkm local
 	sh MAKEDEV sram0 nvram0 flash0 vmel0 vmes0
 	#sh MAKEDEV lp0 lptwo0
+	sh MAKEDEV rnd
 	;;
 
 std)
diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV
index 5cb9cf4f..aa4527f3 100644
--- a/src/etc/etc.pc532/MAKEDEV
+++ b/src/etc/etc.pc532/MAKEDEV
@@ -51,6 +51,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
+#	*rnd	random data source
 #
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -63,7 +64,7 @@ all)
 	sh MAKEDEV std fd sd0 sd1 sd2 st0 st1 cd0 cd1
 	sh MAKEDEV tty0 tty1 tty2 tty3 tty4 tty5 tty6 tty7
 	sh MAKEDEV pty0 pty1 vnd0 vnd1 bpf0 bpf1 bpf2 bpf3 ipl
-	sh MAKEDEV tun0 tun1 tun2 lkm
+	sh MAKEDEV tun0 tun1 tun2 lkm rnd
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	;;
 
@@ -243,6 +244,16 @@ lkm)
 	chmod 640 lkm
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 20 0
+	mknod srnd c 20 1
+	mknod urnd c 20 2
+	mknod prnd c 20 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.pica/MAKEDEV b/src/etc/etc.pica/MAKEDEV
index e418409d..66ad5810 100644
--- a/src/etc/etc.pica/MAKEDEV
+++ b/src/etc/etc.pica/MAKEDEV
@@ -39,6 +39,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
+#	*rnd	random data source
 #
 # Platform-specific devices:
 #
@@ -51,7 +52,7 @@ case $i in
 
 all)        
         sh MAKEDEV std fd fd0 sd0 sd1 sd2 st0 cd0 tty0 tty1 pty0 pty1
-        sh MAKEDEV ttyv0 lpt0 pms0 local
+        sh MAKEDEV ttyv0 lpt0 pms0 rnd local
         ;;
 
 std)
@@ -241,6 +242,16 @@ pty*)
 	esac
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 32 0
+	mknod srnd c 32 1
+	mknod urnd c 32 2
+	mknod prnd c 32 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
index bba9cf3c..0c78d27e 100644
--- a/src/etc/etc.pmax/MAKEDEV
+++ b/src/etc/etc.pmax/MAKEDEV
@@ -29,6 +29,7 @@
 #	cfb*	raw interface to turbochannel PMAG-BA color frame buffer
 #	xcfb*	raw interface to maxine graphics devices
 #	mfb*	raw interface to mono graphics devices
+#	*rnd	random data source
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin
 umask 77
@@ -247,6 +248,16 @@ pty*)
 	esac
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 89 0
+	mknod srnd c 89 1
+	mknod urnd c 89 2
+	mknod prnd c 89 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 8f4277de..a0151667 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -63,6 +63,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
+#	*rnd	random data source
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:/usr/etc
 umask 77
@@ -82,7 +83,7 @@ all)
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 ipl bwtwo0 cgthree0 cgfour0 cgsix0
 	sh MAKEDEV cgeight0
-	sh MAKEDEV lkm local
+	sh MAKEDEV lkm rnd local
 	;;
 std)
 	mknod console		c 0 0
@@ -272,6 +273,16 @@ pty*)
 	esac
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 119 0
+	mknod srnd c 119 1
+	mknod urnd c 119 2
+	mknod prnd c 119 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index 15fe326b..ee20ba09 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/03/28 18:24:39 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1996/07/15 14:59:20 mickey Exp $
 #	$NetBSD: MAKEDEV,v 1.8 1996/03/03 16:54:17 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -58,6 +58,7 @@
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
 #	rd*	RAM-disk
+#	*rnd	random data source
 
 # XXX - Keep /usr/etc so SunOS can find chown
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/etc
@@ -83,7 +84,7 @@ unit=`expr $arg : '[a-z][a-z]*\([0-9][0-9]*\)'`
 case $arg in
 
 all)
-      sh MAKEDEV std fd sd0 sd1 sd2 sd3 st0 st1 pty0
+      sh MAKEDEV std fd sd0 sd1 sd2 sd3 st0 st1 pty0 rnd
 	;;
 
 std)
@@ -207,6 +208,16 @@ rd*)
 	mk rd${unit}c b 13 `expr $unit + 16`
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 72 0
+	mknod srnd c 72 1
+	mknod urnd c 72 2
+	mknod prnd c 72 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index bc88511d..d5ba198f 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -49,6 +49,8 @@
 #	qv*	qvss (microvax) display
 #	ttyv0	qvss (microvax) display reserved pty
 #	lkm	loadable kernel modules
+#	*rnd	random data source
+#
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 umask 77
 for i
@@ -58,7 +60,7 @@ case $i in
 all)
 	sh MAKEDEV std vnd0 ccd0 pty0 lkm ipl
 	sh MAKEDEV tms0 ts0
-	sh MAKEDEV ra0 ra1 ra2 ra3 ra4 ra5 ra6 ra7 hp0 hp1
+	sh MAKEDEV ra0 ra1 ra2 ra3 ra4 ra5 ra6 ra7 hp0 hp1 rnd
 	;;
 
 std)
@@ -407,6 +409,16 @@ ttyv0)
 	mv ptyqf ptyv0
 	;;
 
+rnd|srnd|urnd|prnd)
+	rm -f rnd urnd srnd prnd
+	mknod  rnd c 58 0
+	mknod srnd c 58 1
+	mknod urnd c 58 2
+	mknod prnd c 58 3
+	chown root.wheel rnd srnd urnd prnd
+	chmod 644 rnd srnd urnd prnd
+	;;
+
 local)
 	sh MAKEDEV.local
 	;;