diff --git a/src/mainboard/emulation/qemu-i386/Options.lb b/src/mainboard/emulation/qemu-i386/Options.lb
index 27982ce4fb..82a82a539c 100644
--- a/src/mainboard/emulation/qemu-i386/Options.lb
+++ b/src/mainboard/emulation/qemu-i386/Options.lb
@@ -6,6 +6,9 @@ uses HAVE_HARD_RESET
 uses HAVE_OPTION_TABLE
 uses USE_OPTION_TABLE
 uses CONFIG_COMPRESS
+uses CONFIG_COMPRESSED_ROM_STREAM_NRV2B
+uses CONFIG_COMPRESSED_ROM_STREAM_LZMA
+uses CONFIG_PRECOMPRESSED_ROM_STREAM
 uses CONFIG_ROM_STREAM
 uses IRQ_SLOT_COUNT
 uses MAINBOARD
diff --git a/targets/emulation/qemu-i386/Config.OLPC.lb b/targets/emulation/qemu-i386/Config.OLPC.lb
new file mode 100644
index 0000000000..e6f9ded76a
--- /dev/null
+++ b/targets/emulation/qemu-i386/Config.OLPC.lb
@@ -0,0 +1,22 @@
+# This will make a target directory of ./emulation_qemu-i386
+
+target qemu-i386-OLPC
+mainboard emulation/qemu-i386
+
+option ROM_SIZE=1024*1024
+option CONFIG_COMPRESSED_ROM_STREAM_LZMA=1
+option CONFIG_PRECOMPRESSED_ROM_STREAM=0
+
+option CC="gcc -m32"
+
+option HAVE_PIRQ_TABLE=1
+option IRQ_SLOT_COUNT=6
+
+romimage "image" 
+	option ROM_IMAGE_SIZE=0x10000
+	option LINUXBIOS_EXTRA_VERSION="-OpenBIOS"
+	payload /tmp/olpcpayload.elf
+end
+
+buildrom ./qemu-bios-OLPC.rom ROM_SIZE "image"
+