diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 95183eaa..b361eccf 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.55 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -191,19 +191,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 0ba56819..6b5b605a 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.amd64/MAKEDEV.md,v 1.48 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -197,19 +197,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index 1b6b048b..77505b07 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.armish/MAKEDEV.md,v 1.25 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -184,19 +184,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV
index 4c3c0f35..e4b2b669 100644
--- a/src/etc/etc.aviion/MAKEDEV
+++ b/src/etc/etc.aviion/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.aviion/MAKEDEV.md,v 1.15 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -156,19 +156,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.beagle/MAKEDEV b/src/etc/etc.beagle/MAKEDEV
index 00b95f82..df7ab4f2 100644
--- a/src/etc/etc.beagle/MAKEDEV
+++ b/src/etc/etc.beagle/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.beagle/MAKEDEV.md,v 1.3 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -184,19 +184,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index d8ab4e68..b811b7b5 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.hp300/MAKEDEV.md,v 1.45 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -171,19 +171,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 3dc1699c..5147ff10 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.48 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -182,19 +182,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index 591d1548..e997b205 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.25 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -180,19 +180,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index a4c56f0f..6b70cec9 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.63 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -199,19 +199,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 16e3e93b..50fee68d 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.landisk/MAKEDEV.md,v 1.27 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -180,19 +180,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index f1f0348c..10388386 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.loongson/MAKEDEV.md,v 1.13 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -178,19 +178,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index 9a44be02..4f6ce0d1 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.19 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -163,19 +163,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index e0094892..01bce51d 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -3,9 +3,9 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.50 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.51 2012/09/08 17:18:22 mpi Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -189,19 +189,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index 15ec95ce..4c531dac 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.32 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -166,19 +166,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index 3a0246b0..ae4c6929 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.31 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -161,19 +161,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.palm/MAKEDEV b/src/etc/etc.palm/MAKEDEV
index 4c53f6ec..4b98df9f 100644
--- a/src/etc/etc.palm/MAKEDEV
+++ b/src/etc/etc.palm/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.palm/MAKEDEV.md,v 1.12 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -182,19 +182,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 7559f023..0926788c 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.37 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -177,19 +177,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index d9183255..c93fa796 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.socppc/MAKEDEV.md,v 1.18 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -174,19 +174,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 71a1d9e0..c8f2dd79 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.sparc/MAKEDEV.md,v 1.50 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -178,19 +178,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 30c9a025..13b0d673 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.68 2012/11/03 22:35:40 kettenis Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -195,19 +195,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 4d300078..c61a78d7 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.vax/MAKEDEV.md,v 1.49 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -169,19 +169,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index 4f8bbc9e..1e1d3340 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -5,7 +5,7 @@
 #
 #	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.31 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
 #
@@ -182,19 +182,19 @@ M() {
 	mkl ${5-666} $1 $2 $3 $4
 	G=${6:-wheel}
 	[ "$7" ] && {
-		MKlist[${#MKlist[*]}]=";chown $7:$G $1"
+		MKlist[${#MKlist[*]}]="&& chown $7:$G $1"
 	} || {
 		case $G in
 		wheel)
-			[ ${#whlist[*]} = 0 ] && whlist[0]=";chgrp wheel"
+			[ ${#whlist[*]} = 0 ] && whlist[0]="&& chgrp wheel"
 			whlist[${#whlist[*]}]="$1"
 		;;
 		operator)
-			[ ${#oplist[*]} = 0 ] && oplist[0]=";chgrp operator"
+			[ ${#oplist[*]} = 0 ] && oplist[0]="&& chgrp operator"
 			oplist[${#oplist[*]}]="$1"
 		;;
 		*)
-			MKlist[${#MKlist[*]}]=";chgrp $G $1";
+			MKlist[${#MKlist[*]}]="&& chgrp $G $1";
 		esac
 	}
 	return 0