diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common
index f3f63fb9..74b88489 100644
--- a/src/etc/MAKEDEV.common
+++ b/src/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.93 2016/09/11 03:06:31 deraadt Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.94 2016/09/11 19:59:51 deraadt Exp $-})dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -362,8 +362,8 @@ _mcdev({-ulpt-}, ulpt*, {-ulpt-}, {-major_ulpt_c-}, 660)dnl
 __devitem(ttyU, ttyU*, USB serial ports,ucom)dnl
 _mkdev({-ttyU-}, {-ttyU[0-9a-zA-Z]-}, {-U=${i#ttyU*}
 	o=$(alph2d $U)
-	M ttyU$U c major_ttyU_c $o 660 dialer uucp
-	M cuaU$U c major_ttyU_c Add($o, 128) 660 dialer uucp-})dnl
+	M ttyU$U c major_ttyU_c $o 660 dialer root
+	M cuaU$U c major_ttyU_c Add($o, 128) 660 dialer root-})dnl
 __devitem(ugen, ugen*, Generic USB devices)dnl
 _mkdev(ugen, ugen*, {-n=Mult($U, 16)
 	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
@@ -378,11 +378,11 @@ __devitem(apci, apci*, HP400 4 port serial mux interface)dnl
 __devitem({-com-}, {-tty[0-7][0-9a-f]-}, NS16x50 serial ports)dnl
 _mkdev(com, {-tty[0-7][0-9a-f]-}, {-U=${i#tty*}
 	o=$(h2d $U)
-	M tty$U c major_com_c $o 660 dialer uucp
-	M cua$U c major_com_c Add($o, 128) 660 dialer uucp-})dnl
+	M tty$U c major_com_c $o 660 dialer root
+	M cua$U c major_com_c Add($o, 128) 660 dialer root-})dnl
 __devitem(ttyc, ttyc*, Cyclades serial ports,cy)dnl
 __devitem(ttyVI, ttyVI*, Virtio serial ports,viocon)dnl
-_mkdev(ttyVI, ttyVI*, {-M ttyVI$U c major_ttyVI_c $U 660 dialer uucp-})dnl
+_mkdev(ttyVI, ttyVI*, {-M ttyVI$U c major_ttyVI_c $U 660 dialer root-})dnl
 __devitem(tzs, tty[a-z]*, Zilog 8530 Serial Port,zs)dnl
 _mkdev(tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	case $u in
@@ -392,9 +392,9 @@ _mkdev(tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	d) n=5 ;;
 	*) echo unknown tty device $i ;;
 	esac
-	M tty$u c major_tzs_c $n 660 dialer uucp-})dnl
+	M tty$u c major_tzs_c $n 660 dialer root-})dnl
 __devitem(tth, ttyh*, Sab82532 serial devices,sab)dnl
-_mkdev(tth, ttyh*, {-M ttyh$U c major_tth_c $U 660 dialer uucp-})dnl
+_mkdev(tth, ttyh*, {-M ttyh$U c major_tth_c $U 660 dialer root-})dnl
 __devitem(czs, cua[a-z]*, Zilog 8530 Serial Port,zs)dnl
 _mkdev(czs, cua[a-z], {-u=${i#cua*}
 	case $u in
@@ -404,7 +404,7 @@ _mkdev(czs, cua[a-z], {-u=${i#cua*}
 	d) n=5 ;;
 	*) echo unknown cua device $i ;;
 	esac
-	M cua$u c major_czs_c Add($n, 128) 660 dialer uucp-})dnl
+	M cua$u c major_czs_c Add($n, 128) 660 dialer root-})dnl
 __devitem(tty0, tty00, Standard serial port,com)dnl
 __devitem(mac_tty0, tty00, Standard serial port,zsc)dnl
 __devitem(ttyz, tty[a-d], On-board zs serial ports,zs)dnl
@@ -477,7 +477,7 @@ _mkdev(mag, magma*, {-case $U in
 	while [ $n -lt 16 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c major_mag_c Add($offset, $n) 660 dialer uucp
+		M tty$name c major_mag_c Add($offset, $n) 660 dialer root
 		n=Add($n, 1)
 	done
 	M bpp${nam}0 c major_bppmag_c Add($offset, 0) 600
@@ -493,7 +493,7 @@ _mkdev(spif, spif*, {-case $U in
 	while [ $n -lt 8 ]
 	do
 		name=${nam}`hex $n`
-		M tty$name c major_spif_c Add($offset, $n) 660 dialer uucp
+		M tty$name c major_spif_c Add($offset, $n) 660 dialer root
 		n=Add($n, 1)
 	done
 	M bpp${nam}0 c major_bppsp_c Add($offset, 0) 600-})dnl
diff --git a/src/etc/etc.alpha/MAKEDEV.md b/src/etc/etc.alpha/MAKEDEV.md
index cce3fbf9..163ef117 100644
--- a/src/etc/etc.alpha/MAKEDEV.md
+++ b/src/etc/etc.alpha/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,alpha)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.69 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.70 2016/09/11 19:59:53 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -99,8 +99,8 @@ ttyB*|ttyc*)
 	ttyB*)	type=B major=15 minor=Mult($U, 2);;
 	ttyc*)	type=c major=38 minor=$U;;
 	esac
-	M tty$type$U c $major $minor 660 dialer uucp
-	M cua$type$U c $major Add($minor, 128) 660 dialer uucp
+	M tty$type$U c $major $minor 660 dialer root
+	M cua$type$U c $major Add($minor, 128) 660 dialer root
 	;;
 dnl
 dnl *** alpha specific targets
diff --git a/src/etc/etc.amd64/MAKEDEV.md b/src/etc/etc.amd64/MAKEDEV.md
index b3b87f3d..cd915ec3 100644
--- a/src/etc/etc.amd64/MAKEDEV.md
+++ b/src/etc/etc.amd64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,amd64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.68 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.69 2016/09/11 19:59:53 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -107,8 +107,8 @@ _std(1, 2, 50, 7)
 	;;
 
 ttyc*)
-	M ttyc$U c 38 $U 660 dialer uucp
-	M cuac$U c 38 Add($U, 128) 660 dialer uucp
+	M ttyc$U c 38 $U 660 dialer root
+	M cuac$U c 38 Add($U, 128) 660 dialer root
 	;;
 dnl
 dnl amd64 specific targets
diff --git a/src/etc/etc.i386/MAKEDEV.md b/src/etc/etc.i386/MAKEDEV.md
index 6eaccf56..c7f74ee5 100644
--- a/src/etc/etc.i386/MAKEDEV.md
+++ b/src/etc/etc.i386/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,i386)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.82 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.83 2016/09/11 19:59:53 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -109,8 +109,8 @@ _std(1, 2, 50, 7)
 	;;
 
 ttyc*)
-	M ttyc$U c 38 $U 660 dialer uucp
-	M cuac$U c 38 Add($U, 128) 660 dialer uucp
+	M ttyc$U c 38 $U 660 dialer root
+	M cuac$U c 38 Add($U, 128) 660 dialer root
 	;;
 dnl
 dnl i386 specific targets
diff --git a/src/etc/etc.landisk/MAKEDEV.md b/src/etc/etc.landisk/MAKEDEV.md
index 8f1d114a..f2c3660a 100644
--- a/src/etc/etc.landisk/MAKEDEV.md
+++ b/src/etc/etc.landisk/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,landisk)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.42 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.43 2016/09/11 19:59:53 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -29,7 +29,7 @@ dnl
 dnl *** landisk specific devices
 dnl
 __devitem(scif, ttya, on-board serial port,scif)dnl
-_mkdev(scif, ttya, {-M ttya c major_scif_c 0 660 dialer uucp-})dnl
+_mkdev(scif, ttya, {-M ttya c major_scif_c 0 660 dialer root-})dnl
 dnl
 dnl *** MAKEDEV itself
 dnl
diff --git a/src/etc/etc.luna88k/MAKEDEV.md b/src/etc/etc.luna88k/MAKEDEV.md
index 978b686f..27f3ace4 100644
--- a/src/etc/etc.luna88k/MAKEDEV.md
+++ b/src/etc/etc.luna88k/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,luna88k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.30 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.31 2016/09/11 19:59:53 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -25,8 +25,8 @@ _mkdev(lcd, {-lcd-},
 {-	M lcd c major_lcd_c 0 644 -})dnl
 __devitem(sio, ttya, On-board serial console port)dnl
 _mkdev(sio, {-ttya-},
-{-	M ttya c major_sio_c 0 660 dialer uucp
-	M cuaa c major_sio_c 128 660 dialer uucp -})dnl
+{-	M ttya c major_sio_c 0 660 dialer root
+	M cuaa c major_sio_c 128 660 dialer root -})dnl
 __devitem(pcex, pcex*, PC-9801 extension board slot, pcexmem)dnl
 _mkdev(pcex, {-pcex-},
 {-	M pcexmem c major_pcex_c 0 660
diff --git a/src/etc/etc.macppc/MAKEDEV.md b/src/etc/etc.macppc/MAKEDEV.md
index 7beebdb3..5fbed029 100644
--- a/src/etc/etc.macppc/MAKEDEV.md
+++ b/src/etc/etc.macppc/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.69 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.70 2016/09/11 19:59:53 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -26,14 +26,14 @@ _mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	b) n=1 ;;
 	*) echo unknown tty device $i ;;
 	esac
-	M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl
+	M tty$u c major_s64_tzs_c $n 660 dialer root-})dnl
 _mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
 	*) echo unknown cua device $i ;;
 	esac
-	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
+	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer root-})dnl
 __devitem(apm, apm, Power management device)dnl
 _TITLE(make)
 _DEV(all)
diff --git a/src/etc/etc.sgi/MAKEDEV.md b/src/etc/etc.sgi/MAKEDEV.md
index f1231adc..69b4280e 100644
--- a/src/etc/etc.sgi/MAKEDEV.md
+++ b/src/etc/etc.sgi/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,sgi)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.48 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.49 2016/09/11 19:59:54 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -33,8 +33,8 @@ _mkdev(zs, {-tty[a-b]-}, {-u=${i#tty*}
 	b) n=1 ;;
 	*) echo unknown tty device $i ;;
 	esac
-	M tty$u c major_zs_c $n 660 dialer uucp
-	M cua$u c major_zs_c Add($n, 128) 660 dialer uucp-})dnl
+	M tty$u c major_zs_c $n 660 dialer root
+	M cua$u c major_zs_c Add($n, 128) 660 dialer root-})dnl
 _TITLE(make)
 _DEV(all)
 _DEV(ramd)
diff --git a/src/etc/etc.sparc64/MAKEDEV.md b/src/etc/etc.sparc64/MAKEDEV.md
index 39c485af..6f1b98ab 100644
--- a/src/etc/etc.sparc64/MAKEDEV.md
+++ b/src/etc/etc.sparc64/MAKEDEV.md
@@ -1,6 +1,6 @@
 define(MACHINE,sparc64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.86 2016/09/04 15:38:59 naddy Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.87 2016/09/11 19:59:54 deraadt Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>
@@ -29,7 +29,7 @@ _mkdev(s64_tzs, {-tty[a-z]-}, {-u=${i#tty*}
 	d) n=3 ;;
 	*) echo unknown tty device $i ;;
 	esac
-	M tty$u c major_s64_tzs_c $n 660 dialer uucp-})dnl
+	M tty$u c major_s64_tzs_c $n 660 dialer root-})dnl
 _mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 	case $u in
 	a) n=0 ;;
@@ -38,7 +38,7 @@ _mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 	d) n=3 ;;
 	*) echo unknown cua device $i ;;
 	esac
-	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
+	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer root-})dnl
 __devitem(vcc, ttyV*, Virtual console concentrator, vcctty)dnl
 _mkdev(vcc, ttyV[0-9a-zA-Z], {-U=${i#ttyV*}
 	o=$(alph2d $U)