diff --git a/ChangeLog b/ChangeLog
index 3edfedc03..dba06c260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-03-22  Pavel Roskin  <proski@gno.org>
 
+	* kern/powerpc/ieee1275/startup.S: Replace EXT_C(start) with
+	_start.
+	* kern/i386/pc/startup.S: Likewise.
+	* kern/i386/efi/startup.S: Likewise.
+	* kern/i386/ieee1275/startup.S: Likewise.
+	* kern/i386/coreboot/startup.S: Likewise.
+	* kern/x86_64/efi/startup.S: Likewise.
+
 	* aclocal.m4 (grub_CHECK_START_SYMBOL): Remove.
 	* configure.ac: Don't call grub_CHECK_START_SYMBOL.
 	* kern/i386/pc/startup.S: Use _start instead of START_SYMBOL.
diff --git a/kern/i386/coreboot/startup.S b/kern/i386/coreboot/startup.S
index 835978bfe..b14171e6f 100644
--- a/kern/i386/coreboot/startup.S
+++ b/kern/i386/coreboot/startup.S
@@ -44,7 +44,7 @@ _start:
 	 *  This is a special data area at a fixed offset from the beginning.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -53,7 +53,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
 
 /*
  *  Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).
diff --git a/kern/i386/efi/startup.S b/kern/i386/efi/startup.S
index 4709b3f29..b88628010 100644
--- a/kern/i386/efi/startup.S
+++ b/kern/i386/efi/startup.S
@@ -34,14 +34,14 @@ _start:
          *  These MUST be at byte offset 6 and 7 of the executable
          *  DO NOT MOVE !!!
          */
-        . = EXT_C(start) + 0x6
+        . = _start + 0x6
         .byte   GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 
         /*
          *  This is a special data area 8 bytes from the beginning.
          */
 
-        . = EXT_C(start) + 0x8
+        . = _start + 0x8
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -50,7 +50,7 @@ VARIABLE(grub_prefix)
          *  Leave some breathing room for the prefix.
          */
 
-        . = EXT_C(start) + 0x50
+        . = _start + 0x50
 
 codestart:
 	/*
diff --git a/kern/i386/ieee1275/startup.S b/kern/i386/ieee1275/startup.S
index db6ce1e62..3b030b1b4 100644
--- a/kern/i386/ieee1275/startup.S
+++ b/kern/i386/ieee1275/startup.S
@@ -45,7 +45,7 @@ _start:
 	 *  This is a special data area at a fixed offset from the beginning.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -54,7 +54,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
 
 codestart:
 	movl %eax, EXT_C(grub_ieee1275_entry_fn)
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 7ebe592e4..8e8b66135 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -53,7 +53,7 @@
 #include <multiboot.h>
 #include <multiboot2.h>
 		
-#define ABS(x)	((x) - EXT_C(start) + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
+#define ABS(x)	((x) - _start + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
 	
 	.file	"startup.S"
 
@@ -77,14 +77,14 @@ _start:
 	 *  These MUST be at byte offset 6 and 7 of the executable
 	 *  DO NOT MOVE !!!
 	 */
-	. = EXT_C(start) + 0x6
+	. = _start + 0x6
 	.byte	GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 
 	/*
 	 *  This is a special data area 8 bytes from the beginning.
 	 */
 
-	. = EXT_C(start) + 0x8
+	. = _start + 0x8
 
 VARIABLE(grub_total_module_size)
 	.long	0
@@ -103,7 +103,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 /*
  * Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).
@@ -510,7 +510,7 @@ gate_a20_check_state:
  * The code beyond this point is compressed.  Assert that the uncompressed
  * code fits GRUB_KERNEL_MACHINE_RAW_SIZE.
  */
-	. = EXT_C(start) + GRUB_KERNEL_MACHINE_RAW_SIZE
+	. = _start + GRUB_KERNEL_MACHINE_RAW_SIZE
 
 /*
  *  This call is special...  it never returns...  in fact it should simply
diff --git a/kern/powerpc/ieee1275/startup.S b/kern/powerpc/ieee1275/startup.S
index 4b18fd745..75e1ed852 100644
--- a/kern/powerpc/ieee1275/startup.S
+++ b/kern/powerpc/ieee1275/startup.S
@@ -30,7 +30,7 @@ start:
 _start:
 	b	codestart
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkelfimage */
@@ -39,7 +39,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
 
 codestart:
 	li      2, 0
diff --git a/kern/x86_64/efi/startup.S b/kern/x86_64/efi/startup.S
index 835c4fb28..2cb1fd4a5 100644
--- a/kern/x86_64/efi/startup.S
+++ b/kern/x86_64/efi/startup.S
@@ -36,14 +36,14 @@ _start:
          *  These MUST be at byte offset 6 and 7 of the executable
          *  DO NOT MOVE !!!
          */
-        . = EXT_C(start) + 0x6
+        . = _start + 0x6
         .byte   GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 
         /*
          *  This is a special data area 8 bytes from the beginning.
          */
 
-        . = EXT_C(start) + 0x8
+        . = _start + 0x8
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -52,7 +52,7 @@ VARIABLE(grub_prefix)
          *  Leave some breathing room for the prefix.
          */
 
-        . = EXT_C(start) + 0x50
+        . = _start + 0x50
 
 codestart:
 	movq	%rcx, EXT_C(grub_efi_image_handle)(%rip)