Index: release/amd64/make-memstick.sh
===================================================================
--- release/amd64/make-memstick.sh	(revision 339009)
+++ release/amd64/make-memstick.sh	(working copy)
@@ -36,11 +36,13 @@
 rm ${1}/etc/fstab
 rm ${1}/etc/rc.conf.local
 
+mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part -o ${2}.part2 
+
 mkimg -s mbr \
     -b ${1}/boot/mbr \
     -p efi:=${1}/boot/boot1.efifat \
-    -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
+    -p freebsd:=${2}.part2 \
     -a 2 \
     -o ${2}
-rm ${2}.part
+rm ${2}.part ${2}.part2