diff --git a/src/mainboard/emulation/qemu-x86/Options.lb b/src/mainboard/emulation/qemu-x86/Options.lb
index 74e543f737..e1fa3b13f7 100644
--- a/src/mainboard/emulation/qemu-x86/Options.lb
+++ b/src/mainboard/emulation/qemu-x86/Options.lb
@@ -70,9 +70,8 @@ default HAVE_HARD_RESET=0
 ##
 ## Build code to export a programmable irq routing table
 ##
-default HAVE_PIRQ_TABLE=0
-default IRQ_SLOT_COUNT=5
-#object irq_tables.o
+default HAVE_PIRQ_TABLE=1
+default IRQ_SLOT_COUNT=6
 
 ##
 ## Build code to export a CMOS option table
diff --git a/targets/emulation/qemu-x86/Config-abuild.lb b/targets/emulation/qemu-x86/Config-abuild.lb
index 6d26298f08..b5544a32bd 100644
--- a/targets/emulation/qemu-x86/Config-abuild.lb
+++ b/targets/emulation/qemu-x86/Config-abuild.lb
@@ -1,22 +1,20 @@
-# This will make a target directory of ./emulation_qemu-x86
+target VENDOR_MAINBOARD
+mainboard VENDOR/MAINBOARD
 
-target emulation_qemu-x86
-mainboard emulation/qemu-x86
+option CC="CROSSCC"
+option CROSS_COMPILE="CROSS_PREFIX"
+option HOSTCC="CROSS_HOSTCC"
 
 __COMPRESSION__
 
 option ROM_SIZE=256*1024
 
-option CC="gcc -m32"
-
-option HAVE_PIRQ_TABLE=1
-option IRQ_SLOT_COUNT=6
-
-romimage "image" 
+romimage "fallback" 
+	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option COREBOOT_EXTRA_VERSION="-OpenBIOS"
+	option COREBOOT_EXTRA_VERSION=".0"
 	payload __PAYLOAD__
 end
 
-buildrom ./coreboot.rom ROM_SIZE "image"
+buildrom ./coreboot.rom ROM_SIZE "fallback"