Index: release/tools/arm.subr
===================================================================
--- release/tools/arm.subr
+++ release/tools/arm.subr
@@ -94,23 +94,25 @@
 
 arm_setup_usb_otg() {
 	# Set up virtual serial port over USB OTG / device mode.
-	echo >> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
 	echo '# Required for USB OTG virtual serial port.' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo 'notify 100 {' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo '	match "system"		"DEVFS";' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo '	match "subsystem"	"CDEV";' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo '	match "type"		"CREATE";' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo '	match "cdev"		"ttyU[0-9]+";' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo '	action "/sbin/init q";' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 	echo '};' \
-		>> ${CHROOTDIR}/${DESTDIR}/etc/devd.conf
+		>> ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
+
+	chown 0:0 ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
+	chmod 644 ${CHROOTDIR}/${DESTDIR}/etc/devd/otg.conf
 
 	echo '# USB OTG virtual serial port' \
 		>> ${CHROOTDIR}/${DESTDIR}/etc/ttys