diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 16f6026c..f8dfccaa 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.71 2017/11/02 14:04:24 mpi Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -344,22 +344,22 @@ audio*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 45 $U 660
+	M usb$u c 45 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 47 $U 660
+	M ulpt$U c 47 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 46 $U 660
+	M uhid$U c 46 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 48 $(($n+10#$j)) 660
+		M ugen$U.$j c 48 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 07c1f866..923f99a7 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.71 2019/12/13 21:03:57 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.104 2019/12/13 21:03:57 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -387,22 +387,22 @@ apm*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 64 $U 660
+	M ulpt$U c 64 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 62 $U 660
+	M uhid$U c 62 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 63 $(($n+10#$j)) 660
+		M ugen$U.$j c 63 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.arm64/MAKEDEV b/src/etc/etc.arm64/MAKEDEV
index d4920b7e..cca84af7 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.3 2018/08/20 16:07:39 kettenis Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -342,22 +342,22 @@ apm*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 64 $U 660
+	M ulpt$U c 64 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 62 $U 660
+	M uhid$U c 62 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 63 $(($n+10#$j)) 660
+		M ugen$U.$j c 63 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.armv7/MAKEDEV b/src/etc/etc.armv7/MAKEDEV
index 1cb04bd3..6fd3e67f 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.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -333,22 +333,22 @@ apm*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 64 $U 660
+	M usb$u c 64 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 66 $U 660
+	M ulpt$U c 66 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 65 $U 660
+	M uhid$U c 65 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 70 $(($n+10#$j)) 660
+		M ugen$U.$j c 70 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index ef942972..50a3acb0 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.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -312,24 +312,24 @@ ttyU[0-9a-zA-Z])
 	;;
 
 ulpt*)
-	M ulpt$U c 43 $U 660
+	M ulpt$U c 43 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 42 $(($n+10#$j)) 660
+		M ugen$U.$j c 42 $(($n+10#$j)) 600
 	done
 	;;
 
 uhid*)
-	M uhid$U c 41 $U 660
+	M uhid$U c 41 $U 600
 	;;
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 40 $U 660
+	M usb$u c 40 $U 640
 	;;
 
 uall)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 3fadfd07..ce4bdef0 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.86 2019/12/13 21:03:57 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.104 2019/12/13 21:03:57 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -391,22 +391,22 @@ amdmsr*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 64 $U 660
+	M ulpt$U c 64 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 62 $U 660
+	M uhid$U c 62 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 63 $(($n+10#$j)) 660
+		M ugen$U.$j c 63 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 93eb27df..ce9e30a5 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.landisk/MAKEDEV.md,v 1.43 2016/09/11 19:59:53 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -311,22 +311,22 @@ audio*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 64 $U 660
+	M usb$u c 64 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 66 $U 660
+	M ulpt$U c 66 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 65 $U 660
+	M uhid$U c 65 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 70 $(($n+10#$j)) 660
+		M ugen$U.$j c 70 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index 28546375..d0be4a74 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.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -309,22 +309,22 @@ apm*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 64 $U 660
+	M ulpt$U c 64 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 62 $U 660
+	M uhid$U c 62 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 63 $(($n+10#$j)) 660
+		M ugen$U.$j c 63 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index db49ff60..47d2a1c1 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.32 2016/12/31 00:50:01 aoyama Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index d24b99bb..e89cde51 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.70 2016/09/11 19:59:53 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -340,22 +340,22 @@ apm*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 64 $U 660
+	M ulpt$U c 64 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 62 $U 660
+	M uhid$U c 62 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 63 $(($n+10#$j)) 660
+		M ugen$U.$j c 63 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.octeon/MAKEDEV b/src/etc/etc.octeon/MAKEDEV
index 2c516b8b..a1578dbb 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.14 2019/07/17 14:36:31 visa Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -299,7 +299,7 @@ audio*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 uall)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index d13a41df..8a5b2296 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.49 2016/09/11 19:59:54 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -297,22 +297,22 @@ audio*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 61 $U 660
+	M usb$u c 61 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 64 $U 660
+	M ulpt$U c 64 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 62 $U 660
+	M uhid$U c 62 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 63 $(($n+10#$j)) 660
+		M ugen$U.$j c 63 $(($n+10#$j)) 600
 	done
 	;;
 
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 5be30863..04a54954 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.88 2019/10/20 16:31:10 kettenis Exp 
-#	OpenBSD: MAKEDEV.common,v 1.103 2019/06/11 14:48:56 jcs Exp 
+#	OpenBSD: MAKEDEV.common,v 1.105 2019/12/14 05:05:46 deraadt 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 
 #
@@ -360,22 +360,22 @@ audio*)
 
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
-	M usb$u c 90 $U 660
+	M usb$u c 90 $U 640
 	;;
 
 ulpt*)
-	M ulpt$U c 93 $U 660
+	M ulpt$U c 93 $U 600
 	;;
 
 uhid*)
-	M uhid$U c 91 $U 660
+	M uhid$U c 91 $U 600
 	;;
 
 ugen*)
 	n=$(($U*16))
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
 	do
-		M ugen$U.$j c 92 $(($n+10#$j)) 660
+		M ugen$U.$j c 92 $(($n+10#$j)) 600
 	done
 	;;