--- xen-tools-4.4.0-r4.ebuild	2014-05-28 13:08:47.000000000 +0200
+++ xen-tools-4.4.0-r4.ebuild	2014-05-28 13:55:43.000000000 +0200
@@ -119,13 +119,6 @@
 		export "CONFIG_GCRYPT=y"
 	fi
 
-	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
-		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
-		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
-		eerror "to build xen-tools on your current profile."
-		die "USE=hvm is unsupported on this system."
-	fi
-
 	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
 		if use x86 && use amd64; then
 			die "Confusion! Both x86 and amd64 are set in your use flags!"
@@ -224,9 +217,13 @@
 		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
 	fi
 
-	# Disable hvm support on systems that don't support x86_32 binaries.
 	if ! use hvm; then
 		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die "mkdir of extra-headers failed"
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h
+		export CPATH="${WORKDIR}"/extra-headers
+		einfo "dummy stubs-32.h added"
 	fi
 
 	# Don't bother with qemu, only needed for fully virtualised guests
@@ -411,7 +408,7 @@
 		echo
 		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
 		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 multilib system is required to build HVM support."
+		elog "An x86 or amd64 system is required to build HVM support."
 	fi
 
 	if use qemu; then