@@ -, +, @@ 
---
 catalyst/base/stagebase.py          |  2 ++
 targets/support/bootloader-setup.sh |  5 ++++-
 targets/support/create-iso.sh       | 11 +++++++----
 targets/support/netboot-final.sh    |  2 +-
 targets/support/pre-kmerge.sh       |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)
--- a/catalyst/base/stagebase.py	
+++ a/catalyst/base/stagebase.py	
@@ -130,6 +130,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
                 for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]:
                     self.settings.update(arch_config[arch][host])
                     setarch = arch_config.get('setarch', {}).get(arch, {})
+                    # Save basearch for bootloader/livecd creation
+                    self.settings["basearch"] = arch
                     break
                 else:
                     # Didn't find a matching subarchitecture, keep searching
--- a/targets/support/bootloader-setup.sh	
+++ a/targets/support/bootloader-setup.sh	
@@ -55,7 +55,7 @@ memtest_grub() {
 
 default_append_line=(${cmdline_opts[@]} cdroot)
 
-case ${clst_hostarch} in
+case ${clst_basearch} in
 	alpha)
 		# NO SOFTLEVEL SUPPORT YET
 		acfg=$1/etc/aboot.conf
@@ -202,5 +202,8 @@ case ${clst_hostarch} in
 		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
 		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
 		;;
+	*)
+		die "Cannot create ISO image: unsupported ARCH=${clst_basearch}"
+		;;
 esac
 exit $?
--- a/targets/support/create-iso.sh	
+++ a/targets/support/create-iso.sh	
@@ -5,7 +5,7 @@ source ${clst_shdir}/support/functions.sh
 ## START RUNSCRIPT
 
 # Check for our CD ISO creation tools
-case ${clst_hostarch} in
+case ${clst_basearch} in
 	alpha)
 		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
@@ -42,7 +42,7 @@ if [ -z "${clst_iso_volume_id}" ]
 then
 	case ${clst_livecd_type} in
 		gentoo-*)
-			case ${clst_hostarch} in
+			case ${clst_basearch} in
 				alpha)
 					clst_iso_volume_id="Gentoo Linux - Alpha"
 				;;
@@ -119,7 +119,7 @@ run_mkisofs() {
 }
 
 # Here we actually create the ISO images for each architecture
-case ${clst_hostarch} in
+case ${clst_basearch} in
 	alpha)
 		isoroot_checksum
 
@@ -195,12 +195,15 @@ case ${clst_hostarch} in
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")
-		case ${clst_hostarch} in
+		case ${clst_basearch} in
 		sparc*) extra_opts+=("--sparc-boot") ;;
 		esac
 
 		echo ">> Running grub-mkrescue to create iso image...."
 		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
+	*)
+		die "Cannot create ISO image: unsupported ARCH=${clst_basearch}"
+	;;
 esac
 exit  $?
--- a/targets/support/netboot-final.sh	
+++ a/targets/support/netboot-final.sh	
@@ -19,7 +19,7 @@ rmdir ${clst_target_path}/boot
 
 # Any post-processing necessary for each architecture can be done here.  This
 # may include things like sparc's elftoaout, x86's PXE boot, etc.
-case ${clst_hostarch} in
+case ${clst_basearch} in
 	hppa)
 		# Only one kernel should be there
 		kname=${clst_boot_kernel[0]}
--- a/targets/support/pre-kmerge.sh	
+++ a/targets/support/pre-kmerge.sh	
@@ -4,7 +4,7 @@ RUN_DEFAULT_FUNCS="yes"
 
 source /tmp/chroot-functions.sh
 
-if [[ ${clst_hostarch} == hppa ]]; then
+if [[ ${clst_basearch} == hppa ]]; then
 	for i in ${clst_boot_kernel}; do
 		case ${i} in
 			*32)
--