diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index ae89b24d..b9103b55 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.69 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.70 2016/09/11 19:59:53 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -281,12 +281,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 34 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 34 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 5c5f5e76..f672cea7 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.amd64/MAKEDEV.md,v 1.69 2016/09/11 19:59:53 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.94 2016/09/11 19:59:51 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -293,12 +293,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 45 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 45 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.arm64/MAKEDEV b/src/etc/etc.arm64/MAKEDEV
index 8c5716d9..3b86e172 100644
--- a/src/etc/etc.arm64/MAKEDEV
+++ b/src/etc/etc.arm64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.arm64/MAKEDEV.md,v 1.2 2017/01/23 12:43:48 kettenis Exp 
-#	OpenBSD: MAKEDEV.common,v 1.94 2016/09/11 19:59:51 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -263,12 +263,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 45 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 45 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.armv7/MAKEDEV b/src/etc/etc.armv7/MAKEDEV
index 3510c364..e1678a60 100644
--- a/src/etc/etc.armv7/MAKEDEV
+++ b/src/etc/etc.armv7/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.armv7/MAKEDEV.md,v 1.14 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -261,12 +261,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 40 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index bd49082e..56004fca 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.60 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -252,12 +252,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 20 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 20 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 pppx*)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 44a9d78e..c3616914 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.83 2016/09/11 19:59:53 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.94 2016/09/11 19:59:51 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -294,12 +294,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 45 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 45 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 3363c748..1065addc 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.42 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.43 2016/09/11 19:59:53 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -252,12 +252,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 40 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index 8321ae4c..fad9974c 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.loongson/MAKEDEV.md,v 1.27 2017/05/21 13:00:53 visa Exp 
-#	OpenBSD: MAKEDEV.common,v 1.94 2016/09/11 19:59:51 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -244,12 +244,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 33 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 33 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 pppx*)
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index c63a257b..2bf6dbb1 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.31 2016/09/11 19:59:53 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.94 2016/09/11 19:59:51 deraadt Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.32 2016/12/31 00:50:01 aoyama Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -236,12 +236,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 40 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 pppx*)
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 405ed032..bf2dc881 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.69 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.70 2016/09/11 19:59:53 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -262,12 +262,11 @@ rmidi*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 40 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 radio*)
diff --git a/src/etc/etc.octeon/MAKEDEV b/src/etc/etc.octeon/MAKEDEV
index 95001656..dd2169ff 100644
--- a/src/etc/etc.octeon/MAKEDEV
+++ b/src/etc/etc.octeon/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.octeon/MAKEDEV.md,v 1.13 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -241,12 +241,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 33 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 33 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 pppx*)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 986300fb..261be7e1 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.48 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.49 2016/09/11 19:59:54 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -243,12 +243,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 33 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 33 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 pppx*)
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index 8f5ea023..4b5fe0d4 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.socppc/MAKEDEV.md,v 1.31 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -236,12 +236,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 40 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 40 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 pppx*)
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index ed5d4c38..db4b71ca 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.86 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.87 2016/09/11 19:59:54 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.96 2017/10/16 20:26:52 naddy Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -291,12 +291,11 @@ tun*)
 	;;
 
 *random)
-	n=0
-	for pre in " " s u a
-	do
-		M ${pre}random c 119 $n 644
-		n=$(($n+1))
-	done
+	M urandom c 119 0 644
+	RMlist[${#RMlist[*]}]=random
+	MKlist[${#MKlist[*]}]=";ln -s urandom random"
+	RMlist[${#RMlist[*]}]=arandom
+	MKlist[${#MKlist[*]}]=";ln -s urandom arandom"
 	;;
 
 rmidi*)