diff --git a/ChangeLog b/ChangeLog
index 2ad827f23..e85a7cf81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-07  Vesa Jaaskelainen  <chaac@nic.fi>
+
+	* kern/i386/pc/startup.S (grub_exit): Added missing .code32 tag.
+
 2006-05-02  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* kern/env.c (struct grub_env_context): Removed "sorted". Renamed
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 45a919c3c..9fdbb2384 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -636,6 +636,7 @@ FUNCTION(grub_exit)
 	/* Tell the BIOS a boot failure. If this does not work, reboot.  */
 	int	$0x18
 	jmp	cold_reboot
+	.code32
 	
 /*
  * grub_reboot()