Index: kernel/arch/amd64/_link.ld.in
===================================================================
--- kernel/arch/amd64/_link.ld.in	(revision 3ce781f475c32746c4d1a7a2a7090be49e8552a4)
+++ kernel/arch/amd64/_link.ld.in	(revision e394c1962a6fec2218e561da2994f4070e2be503)
@@ -15,5 +15,5 @@
 	kernel_load_address = PA2KA(BOOT_OFFSET);
 
-	.unmapped BOOT_OFFSET: AT (0) {
+	.unmapped (BOOT_OFFSET + SIZEOF_HEADERS): AT (BOOT_OFFSET + SIZEOF_HEADERS) {
 		unmapped_start = .;
 		*(K_TEXT_START);
@@ -23,5 +23,5 @@
 	}
 
-	.mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)) : AT (SIZEOF(.unmapped)) {
+	.mapped (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)) : AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
 		ktext_start = .;
 		*(.text .text.*);
Index: kernel/arch/ia32/_link.ld.in
===================================================================
--- kernel/arch/ia32/_link.ld.in	(revision 3ce781f475c32746c4d1a7a2a7090be49e8552a4)
+++ kernel/arch/ia32/_link.ld.in	(revision e394c1962a6fec2218e561da2994f4070e2be503)
@@ -15,5 +15,5 @@
 	kernel_load_address = PA2KA(BOOT_OFFSET);
 
-	.unmapped BOOT_OFFSET: AT (0) {
+	.unmapped (BOOT_OFFSET + SIZEOF_HEADERS): AT (BOOT_OFFSET + SIZEOF_HEADERS) {
 		unmapped_start = .;
 		*(K_TEXT_START);
@@ -22,5 +22,5 @@
 	}
 
-	.mapped (PA2KA(BOOT_OFFSET)+SIZEOF(.unmapped)): AT (SIZEOF(.unmapped)) {
+	.mapped (PA2KA(BOOT_OFFSET) + SIZEOF_HEADERS + SIZEOF(.unmapped)): AT (BOOT_OFFSET + SIZEOF_HEADERS + SIZEOF(.unmapped)) {
 		ktext_start = .;
 		*(.text .text.*);