Index: kernel/arch/amd64/_link.ld.in
===================================================================
--- kernel/arch/amd64/_link.ld.in	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/arch/amd64/_link.ld.in	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -11,4 +11,6 @@
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
+
+ENTRY(multiboot_image_start)
 
 SECTIONS {
Index: kernel/arch/amd64/src/boot/multiboot.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot.S	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/arch/amd64/src/boot/multiboot.S	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -80,9 +80,9 @@
 	.long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
 #endif
-	.long multiboot_header
-	.long unmapped_start
-	.long 0
-	.long 0
-	.long multiboot_image_start
+	.long 0
+	.long 0
+	.long 0
+	.long 0
+	.long 0
 #ifdef CONFIG_FB
 	.long 0
Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -60,25 +60,4 @@
 	tag_info_req_end:
 
-	/* Address tag */
-	.align 8
-	tag_address_start:
-		.word MULTIBOOT2_TAG_ADDRESS
-		.word MULTIBOOT2_FLAGS_REQUIRED
-		.long tag_address_end - tag_address_start
-		.long multiboot2_header_start
-		.long unmapped_start
-		.long 0
-		.long 0
-	tag_address_end:
-
-	/* Entry address tag */
-	.align 8
-	tag_entry_address_start:
-		.word MULTIBOOT2_TAG_ENTRY_ADDRESS
-		.word MULTIBOOT2_FLAGS_REQUIRED
-		.long tag_entry_address_end - tag_entry_address_start
-		.long multiboot_image_start
-	tag_entry_address_end:
-
 	/* Flags tag */
 	.align 8
Index: kernel/arch/ia32/_link.ld.in
===================================================================
--- kernel/arch/ia32/_link.ld.in	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/arch/ia32/_link.ld.in	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -11,4 +11,6 @@
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
+
+ENTRY(multiboot_image_start)
 
 SECTIONS {
Index: kernel/arch/ia32/src/boot/multiboot.S
===================================================================
--- kernel/arch/ia32/src/boot/multiboot.S	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/arch/ia32/src/boot/multiboot.S	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -74,9 +74,9 @@
 	.long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS_NOFB)  /* checksum */
 #endif
-	.long multiboot_header
-	.long unmapped_start
-	.long 0
-	.long 0
-	.long multiboot_image_start
+	.long 0
+	.long 0
+	.long 0
+	.long 0
+	.long 0
 #ifdef CONFIG_FB
 	.long 0
Index: kernel/arch/ia32/src/boot/multiboot2.S
===================================================================
--- kernel/arch/ia32/src/boot/multiboot2.S	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/arch/ia32/src/boot/multiboot2.S	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -58,25 +58,4 @@
 	tag_info_req_end:
 
-	/* Address tag */
-	.align 8
-	tag_address_start:
-		.word MULTIBOOT2_TAG_ADDRESS
-		.word MULTIBOOT2_FLAGS_REQUIRED
-		.long tag_address_end - tag_address_start
-		.long multiboot2_header_start
-		.long unmapped_start
-		.long 0
-		.long 0
-	tag_address_end:
-
-	/* Entry address tag */
-	.align 8
-	tag_entry_address_start:
-		.word MULTIBOOT2_TAG_ENTRY_ADDRESS
-		.word MULTIBOOT2_FLAGS_REQUIRED
-		.long tag_entry_address_end - tag_entry_address_start
-		.long multiboot_image_start
-	tag_entry_address_end:
-
 	/* Flags tag */
 	.align 8
Index: kernel/genarch/include/genarch/multiboot/multiboot.h
===================================================================
--- kernel/genarch/include/genarch/multiboot/multiboot.h	(revision e3fa1720e83c1029187354ec92323608505ed7e3)
+++ kernel/genarch/include/genarch/multiboot/multiboot.h	(revision 2214382eafe65c13cf80c543f085426b751add11)
@@ -40,6 +40,6 @@
 
 #define MULTIBOOT_HEADER_MAGIC       0x1badb002
-#define MULTIBOOT_HEADER_FLAGS       0x00010007
-#define MULTIBOOT_HEADER_FLAGS_NOFB  0x00010003
+#define MULTIBOOT_HEADER_FLAGS       0x00000007
+#define MULTIBOOT_HEADER_FLAGS_NOFB  0x00000003
 
 #define MULTIBOOT_LOADER_MAGIC  0x2badb002