diff --git a/distrib/utils/embedded/conf/rpi.conf b/distrib/utils/embedded/conf/rpi.conf
index 23c7087dbd20..f088cf6ec691 100644
--- a/distrib/utils/embedded/conf/rpi.conf
+++ b/distrib/utils/embedded/conf/rpi.conf
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.6 2013/01/15 03:26:28 christos Exp $
+# $NetBSD: rpi.conf,v 1.7 2013/01/15 03:56:20 christos Exp $
 # Raspberry PI customization script used by mkimage
 #
 image=$HOME/rpi.img
@@ -6,13 +6,13 @@ image=$HOME/rpi.img
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 
-sets="base etc comp games man misc modules tests text"
+sets="base etc comp games man misc modules text"
 setsdir=$obj/evbarm//media/evbarm/binary/sets/
 kerneldir=$src/sys/arch/evbarm/compile/RPI
 specialdirs="/kern /proc"
 
 swap=256
-extra=8
+extra=$(( 150 + 8 ))	# cylinder groups ~150MB
 boot=112
 init=8
 
@@ -69,7 +69,7 @@ EOF
 	${sudo} fdisk -f -u -0 -s ${msdosid}/${bootoffset}/${bootsize} -F ${image}
 	${sudo} newfs /dev/r${vnddev}a
 	${sudo} newfs_msdos /dev/r${vnddev}e
-	${sudo} mount /dev/${vnddev}a ${mnt}
+	${sudo} mount -o async /dev/${vnddev}a ${mnt}
 	${sudo} mkdir ${mnt}/boot
 	${sudo} mount_msdos /dev/${vnddev}e ${mnt}/boot
 }