diff --git a/ChangeLog b/ChangeLog
index d80c7be2b..1a2d8cf02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/boot/i386/pc/diskboot.S (firstlist): Rename to ...
+	(LOCAL(firstlist)): ... this. Move it before the firstlist and not
+	after. All users updated.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use the common size routine in hostfs so we can read disks as well.
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
index 92f223f0d..d030a14c9 100644
--- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S
@@ -56,7 +56,7 @@ _start:
 	popw	%si
 
 	/* this sets up for the first run through "bootloop" */
-	movw	$(firstlist - GRUB_BOOT_MACHINE_LIST_SIZE), %di
+	movw	$LOCAL(firstlist), %di
 
 	/* save the sector number of the second sector in %ebp */
 	movl	(%di), %ebp
@@ -363,7 +363,7 @@ LOCAL(message):
 	.word 0
 
 	. = _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
-
+LOCAL(firstlist):	/* this label has to be before the first list entry!!! */
         /* fill the first data listing with the default */
 blocklist_default_start:
 	/* this is the sector start parameter, in logical sectors from
@@ -376,5 +376,3 @@ blocklist_default_len:
 blocklist_default_seg:
 	/* this is the segment of the starting address to load the data into */
 	.word (GRUB_BOOT_MACHINE_KERNEL_SEG + 0x20)
-
-firstlist:	/* this label has to be after the list data!!! */