diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index f152ee19..20b6e0d2 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.7 1996/07/23 06:15:13 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/08/28 08:55:18 deraadt 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,7 +69,7 @@
 #	mmclock	memory mapped clock
 #	kbd	keyboard (provides events, for X11)
 #	mouse	mouse (provides events, for X11)
-#	*rnd	inkernel random number generator
+#	*random	inkernel random number generator
 #	uk*	unknown SCSI
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -84,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 rnd
+	sh MAKEDEV mmclock kbd mouse lpa0 lpt0 random
 	sh MAKEDEV local
 	;;
 
@@ -274,14 +274,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 33 0
+	mknod srandom c 33 1
+	mknod urandom c 33 2
+	mknod prandom c 33 3
+	mknod arandom c 33 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 uk*)
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index d1ed5bb6..42ef6946 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.11 1996/08/23 18:26:29 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.12 1996/08/28 08:55:20 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
 #	ipf	IP filter
 #	ss*	SCSI scanner
 #	uk*	unknown SCSI
-#	*rnd	random data source
+#	*random	random data source
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 umask 77
@@ -107,7 +107,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 rnd local
+	sh MAKEDEV tun0 tun1 par0 lkm ss0 random local
 	;;
 
 floppy)
@@ -480,14 +480,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 35 0
+	mknod srandom c 35 1
+	mknod urandom c 35 2
+	mknod prandom c 35 3
+	mknod arandom c 35 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 uk*)
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index 6d556bd3..44b47eb6 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.3 1996/08/26 11:03:49 pefo Exp $
+#	$OpenBSD: MAKEDEV,v 1.4 1996/08/28 08:55:21 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -40,7 +40,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
-#	*rnd	random data source
+#	*random	random data source
 #
 # Platform-specific devices:
 #
@@ -53,7 +53,7 @@ case $i in
 
 all)        
         sh MAKEDEV std fd fd0 sd0 sd1 sd2 st0 cd0 tty0 tty1 pty0 pty1
-        sh MAKEDEV ttyC0 lpt0 pms0 rnd bpf0 local
+        sh MAKEDEV ttyC0 lpt0 pms0 random bpf0 local
         ;;
 
 std)
@@ -243,14 +243,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 32 0
+	mknod srandom c 32 1
+	mknod urandom c 32 2
+	mknod prandom c 32 3
+	mknod arandom c 32 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index f6a7b2f3..efa06fc3 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.4 1996/07/23 06:32:54 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.5 1996/08/28 08:55:22 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
 #	ss*	SCSI scanner device
 #	iic*	IIC bus device
 #	rtc*	RTC device
-#	*rnd	random data source
+#	*random	random data source
 #
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -92,7 +92,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 rnd
+	sh MAKEDEV lpa0 lpt0 bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 random
 	sh MAKEDEV beep lkm quadmouse local cpu0 cpu1 cpu2 cpu3 cpu4 cpu5
 	;;
 
@@ -347,14 +347,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 44 0
+	mknod srandom c 44 1
+	mknod urandom c 44 2
+	mknod prandom c 44 3
+	mknod arandom c 44 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index 021caa3f..bd15bab7 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -79,7 +79,7 @@
 #	lkm	loadable kernel modules interface.
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
-#	*rnd	random data source
+#	*random	random data source
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 umask 77
@@ -93,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 rnd local
+	sh MAKEDEV tun0 tun1 lkm ser02 mdm02 lpt0 random local
 	;;
 
 floppy)
@@ -397,14 +397,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 30 0
+	mknod srandom c 30 1
+	mknod urandom c 30 2
+	mknod prandom c 30 3
+	mknod arandom c 30 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index a9e5d2c0..d011f9f9 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.18 1996/08/24 21:05:09 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.19 1996/08/28 08:55:23 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
 #	tun*	network tunnel driver
 #	joy*	joystick driver
 #	pcmcia*	PCMCIA card drivers
-#	*rnd	inkernel random number generator
+#	*random	inkernel random number generator
 #	uk*	"unknown SCSI" devices
 #
 
@@ -96,7 +96,7 @@ all)
 	sh MAKEDEV lpt0 lpt1 lpt2 ttyC0 ttyC1 ttyC2 bpf0 bpf1 bpf2 bpf3
 	sh MAKEDEV ipl tun0 tun1 tun2
 	sh MAKEDEV speaker lkm mms0 lms0 pms0 audio joy0 joy1 apm pcmcia local
-	sh MAKEDEV rnd uk0 uk1 pctr
+	sh MAKEDEV random uk0 uk1 pctr
 # MISSING:
 #	sh MAKEDEV mouse-?
 	;;
@@ -203,9 +203,10 @@ ccd*|fd*|sd*|vnd*|wd*)
 
 com*|tty*)					# (XXX -- com should die)
 	unit=`expr $i : '...\(.*\)'`
-	rm -f com$unit tty0$unit
+	rm -f com$unit tty0$unit cua0$unit
 	mknod tty0$unit c 8 $unit
-	chown uucp.wheel tty0$unit
+	mknod cua0$unit c 8 `expr $unit + 128`
+	chown uucp.wheel tty0$unit cua0$unit
 	;;
 
 pty*)
@@ -399,14 +400,15 @@ apm*)
 	chmod 644 apm apmctl
 	;;
 
-rnd|srnd|urnd|prnd)
-	rm -f rnd urnd srnd prnd
-	mknod  rnd c 45 0
-	mknod srnd c 45 1
-	mknod urnd c 45 2
-	mknod prnd c 45 3
-	chown root.wheel rnd srnd urnd prnd
-	chmod 644 rnd srnd urnd prnd
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 45 0
+	mknod srandom c 45 1
+	mknod urandom c 45 2
+	mknod prandom c 45 3
+	mknod arandom c 45 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 pcmcia*)
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 2a0e9638..ec09b3ac 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/07/23 06:32:56 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1996/08/28 08:55:24 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -58,7 +58,7 @@
 #	bpf*	packet filter
 #	tun*	network tunnel driver
 #	lkm	Device to for loadable kernel modules
-#	*rnd	random data source
+#	*random	random data source
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin
@@ -78,7 +78,7 @@ all)
 	sh MAKEDEV bpf8 bpf9 bpfa bpfb ipl
 	sh MAKEDEV tun0 tun1 tun2 tun3
 	sh MAKEDEV lkm
-	sh MAKEDEV rnd
+	sh MAKEDEV random
 	sh MAKEDEV local
 	;;
 
@@ -324,14 +324,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 33 0
+	mknod srandom c 33 1
+	mknod urandom c 33 2
+	mknod prandom c 33 3
+	mknod arandom c 33 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index ca67c37c..b05459b3 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.9 1996/07/23 06:32:57 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.10 1996/08/28 08:55:25 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: MAKEDEV,v 1.9 1996/07/23 06:32:57 etheisen Exp $
+#	$Id: MAKEDEV,v 1.10 1996/08/28 08:55:25 deraadt Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -66,6 +66,7 @@
 # Special purpose devices:
 #	lkm	loadable kernel modules interface.
 #	bpf*	Berkeley Packet Filter
+#	*random	inkernel random number generator
 #	tun*	network tunnel driver
 #
 # Machine specific devices:
@@ -91,7 +92,7 @@ all)
 	sh MAKEDEV tun0 tun1 lkm local
 	sh MAKEDEV sram0 nvram0 flash0 vmel0 vmes0
 	#sh MAKEDEV lp0 lptwo0
-	sh MAKEDEV rnd
+	sh MAKEDEV random
 	;;
 
 std)
@@ -349,6 +350,17 @@ sram*|nvram*|flash*|vmel*|vmes*)
         chmod 640 $i
 	;;
 
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 40 0
+	mknod srandom c 40 1
+	mknod urandom c 40 2
+	mknod prandom c 40 3
+	mknod arandom c 40 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
+	;;
+
 local)
 	umask 0
 	sh MAKEDEV.local
diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV
index df0341e3..67f88d2e 100644
--- a/src/etc/etc.pc532/MAKEDEV
+++ b/src/etc/etc.pc532/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.5 1996/07/23 06:32:58 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 1996/08/28 08:55:26 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -53,7 +53,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
-#	*rnd	random data source
+#	*random	random data source
 #
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -66,7 +66,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 rnd
+	sh MAKEDEV tun0 tun1 tun2 lkm random
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	;;
 
@@ -246,14 +246,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 20 0
+	mknod srandom c 20 1
+	mknod urandom c 20 2
+	mknod prandom c 20 3
+	mknod arandom c 20 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.pica/MAKEDEV b/src/etc/etc.pica/MAKEDEV
index b22788bb..a50f4a97 100644
--- a/src/etc/etc.pica/MAKEDEV
+++ b/src/etc/etc.pica/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.4 1996/07/23 06:32:58 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.5 1996/08/28 08:55:27 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -40,7 +40,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
-#	*rnd	random data source
+#	*random	random data source
 #
 # Platform-specific devices:
 #
@@ -53,7 +53,7 @@ case $i in
 
 all)        
         sh MAKEDEV std fd fd0 sd0 sd1 sd2 st0 cd0 tty0 tty1 pty0 pty1
-        sh MAKEDEV ttyv0 lpt0 pms0 rnd local
+        sh MAKEDEV ttyv0 lpt0 pms0 random local
         ;;
 
 std)
@@ -243,14 +243,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 32 0
+	mknod srandom c 32 1
+	mknod urandom c 32 2
+	mknod prandom c 32 3
+	mknod arandom c 32 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
index cf5920d7..6076f734 100644
--- a/src/etc/etc.pmax/MAKEDEV
+++ b/src/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.5 1996/07/23 06:32:59 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 1996/08/28 08:55:27 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -30,7 +30,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
+#	*random	random data source
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin
 umask 77
@@ -249,14 +249,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 89 0
+	mknod srandom c 89 1
+	mknod urandom c 89 2
+	mknod prandom c 89 3
+	mknod arandom c 89 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 4bb3b34c..60b068b8 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/07/23 06:33:00 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1996/08/28 08:55:28 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -65,7 +65,7 @@
 #	bpf*	packet filter
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
-#	*rnd	random data source
+#	*random	random data source
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:/usr/etc
 umask 77
@@ -85,7 +85,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 rnd local
+	sh MAKEDEV lkm random local
 	;;
 std)
 	mknod console		c 0 0
@@ -275,14 +275,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 119 0
+	mknod srandom c 119 1
+	mknod urandom c 119 2
+	mknod prandom c 119 3
+	mknod arandom c 119 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index ee20ba09..ee4c0fa4 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.7 1996/07/15 14:59:20 mickey Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/08/28 08:55:29 deraadt 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,7 +58,7 @@
 #	lkm	loadable kernel modules interface
 #	tun*	network tunnel driver
 #	rd*	RAM-disk
-#	*rnd	random data source
+#	*random	random data source
 
 # XXX - Keep /usr/etc so SunOS can find chown
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/etc
@@ -84,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 rnd
+      sh MAKEDEV std fd sd0 sd1 sd2 sd3 st0 st1 pty0 random
 	;;
 
 std)
@@ -208,14 +208,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 72 0
+	mknod srandom c 72 1
+	mknod urandom c 72 2
+	mknod prandom c 72 3
+	mknod arandom c 72 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 46b3cde2..5f49899b 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/07/23 06:33:00 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1996/08/28 08:55:30 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/01/07 16:53:15 ragge Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
@@ -51,7 +51,7 @@
 #	qv*	qvss (microvax) display
 #	ttyv0	qvss (microvax) display reserved pty
 #	lkm	loadable kernel modules
-#	*rnd	random data source
+#	*random	random data source
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 umask 77
@@ -62,7 +62,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 rnd
+	sh MAKEDEV ra0 ra1 ra2 ra3 ra4 ra5 ra6 ra7 hp0 hp1 random
 	;;
 
 std)
@@ -411,14 +411,15 @@ 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
+random|srandom|urandom|prandom|arandom)
+	rm -f random urandom srandom prandom arandom
+	mknod  random c 58 0
+	mknod srandom c 58 1
+	mknod urandom c 58 2
+	mknod prandom c 58 3
+	mknod arandom c 58 4
+	chown root.wheel random srandom urandom prandom arandom
+	chmod 644 random srandom urandom prandom arandom
 	;;
 
 local)