diff --git a/publish/rcn-ee_bb.org-stable.sh b/publish/rcn-ee_bb.org-stable.sh
index 2f5bb4809872770ed78d14d9ea148b5423ddd712..6caea5d0af1ff424e1d15cf0bf4426203e7e2133 100755
--- a/publish/rcn-ee_bb.org-stable.sh
+++ b/publish/rcn-ee_bb.org-stable.sh
@@ -154,8 +154,8 @@ options="--img-2gb omap5-uevm-\${base_rootfs} ${omap5_uevm}" ; generate_img
 
 ###usbflasher images: (also single partition)
 base_rootfs="${debian_jessie_usbflasher}" ; blend="usbflasher" ; extract_base_rootfs
-options="--img-2gb BBB-blank-\${base_rootfs} --dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc --hostname beaglebone --bbb-usb-flasher" ; generate_img
-options="--img-2gb bbx15-\${base_rootfs} --dtb am57xx-beagle-x15 --hostname BeagleBoard-X15 --bbb-usb-flasher" ; generate_img
+options="--img-2gb BBB-blank-\${base_rootfs} --dtb bbb-blank-eeprom --bbb-old-bootloader-in-emmc --hostname beaglebone --usb-flasher" ; generate_img
+options="--img-2gb bbx15-\${base_rootfs} --dtb am57xx-beagle-x15 --hostname BeagleBoard-X15 --usb-flasher" ; generate_img
 
 ###archive *.tar
 base_rootfs="${debian_wheezy_machinekit}" ; blend="machinekit" ; archive_base_rootfs
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index ce41af1e13b72b06b75e5e53dbbe4434712f3fc9..c2cddb6a6601ee3298f984c1179af8443fb0b9da 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1088,7 +1088,7 @@ populate_rootfs () {
 			echo "" >> ${wfile}
 		fi
 
-		if [ "x${bbb_usb_flasher}" = "xenable" ] ; then
+		if [ "x${usb_flasher}" = "xenable" ] ; then
 			echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-from-usb-media.sh" >> ${wfile}
 		elif [ "x${bbb_flasher}" = "xenable" ] ; then
 			echo "##enable BBB: eMMC Flasher:" >> ${wfile}
@@ -1102,6 +1102,10 @@ populate_rootfs () {
 			echo "#cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3.sh" >> ${wfile}
 		fi
 		echo "" >> ${wfile}
+	else
+		if [ "x${usb_flasher}" = "xenable" ] ; then
+			echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-from-usb-media.sh" >> ${wfile}
+		fi
 	fi
 
 	#am335x_boneblack is a custom u-boot to ignore empty factory eeproms...
@@ -1549,8 +1553,8 @@ while [ ! -z "$1" ] ; do
 	--bbg-flasher)
 		bbg_flasher="enable"
 		;;
-	--bbb-usb-flasher)
-		bbb_usb_flasher="enable"
+	--bbb-usb-flasher|--usb-flasher)
+		usb_flasher="enable"
 		;;
 	--beagleboard.org-production)
 		bborg_production="enable"