diff --git a/ChangeLog b/ChangeLog
index 9ace29cc2..eed00a623 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* boot/i386/qemu/boot.S: Add a missing .code16.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use LBIO on coreboot.
diff --git a/boot/i386/qemu/boot.S b/boot/i386/qemu/boot.S
index a93fe3943..03631a22a 100644
--- a/boot/i386/qemu/boot.S
+++ b/boot/i386/qemu/boot.S
@@ -63,5 +63,8 @@ VARIABLE(grub_core_entry_addr)
 	   *right here* and this is why we need this kludge.  */
 
 	. = GRUB_BOOT_MACHINE_SIZE - 16
+
+       .code16
+       
 	jmp	_start
 	. = GRUB_BOOT_MACHINE_SIZE