diff --git a/Architecture/amd64/Bootstrap/Multiboot/1/Header.asm b/Architecture/amd64/Bootstrap/Multiboot/1/Header.asm
new file mode 100644
index 0000000..4fd7789
--- /dev/null
+++ b/Architecture/amd64/Bootstrap/Multiboot/1/Header.asm
@@ -0,0 +1,7 @@
+section .multiboot
+align 4
+    dd 0x1BADB002
+    dd 1 << 0 | 1 << 1
+    dd -(0x1BADB002 + (1 << 0 | 1 << 1))
+
+; TODO
diff --git a/Architecture/amd64/Bootstrap/Multiboot/2/Header.asm b/Architecture/amd64/Bootstrap/Multiboot/2/Header.asm
new file mode 100644
index 0000000..756dcb8
--- /dev/null
+++ b/Architecture/amd64/Bootstrap/Multiboot/2/Header.asm
@@ -0,0 +1,64 @@
+; https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html
+section .multiboot2
+align 4096
+HEADER_START:
+    dd 0xE85250D6
+    dd 0
+    dd (HEADER_END - HEADER_START)
+    dd 0x100000000 - (HEADER_END - HEADER_START) - 0 - 0xE85250D6
+align 8
+MB2_INFO_REQUEST_TAG_START:
+    dw 1
+    dw 0
+    dd MB2_INFO_REQUEST_TAG_END - MB2_INFO_REQUEST_TAG_START
+    dd 1 ; Command Line
+    dd 2 ; Boot Loader Name
+    dd 3 ; Module
+    dd 4 ; Basic Memory Information
+    dd 5 ; BIOS Boot Device
+    dd 6 ; Memory Map
+    dd 7 ; VBE
+    dd 8 ; Framebuffer
+    dd 9 ; ELF Sections
+    dd 10 ; APM Table
+    dd 11 ; EFI 32-bit System Table Pointer
+    dd 12 ; EFI 64-bit System Table Pointer
+    ; dd 13 ; SMBIOS
+    dd 14 ; ACPI Old
+    dd 15 ; ACPI New
+    dd 16 ; Network
+    dd 17 ; EFI Memory Map
+    dd 18 ; EFI Boot Services Notifier
+    dd 19 ; EFI 32-bit Image Handle Pointer
+    dd 20 ; EFI 64-bit Image Handle Pointer
+    dd 21 ; Load Base Address
+MB2_INFO_REQUEST_TAG_END:
+align 8
+MB2_FRAMEBUFFER_TAG_START:
+    dw 5
+    dw 1
+    dd MB2_FRAMEBUFFER_TAG_END - MB2_FRAMEBUFFER_TAG_START
+    dd 0
+    dd 0
+    dd 32
+MB2_FRAMEBUFFER_TAG_END:
+align 8
+MB2_EGA_SUPPORT_TAG_START:
+    dw 4
+    dw 0
+    dd MB2_EGA_SUPPORT_TAG_END - MB2_EGA_SUPPORT_TAG_START
+    dd 1 ; https://www.gnu.org/software/grub/manual/multiboot2/html_node/Console-header-tags.html
+MB2_EGA_SUPPORT_TAG_END:
+align 8
+MB2_MODULE_ALIGN_TAG_START:
+    dw 6
+    dw 0
+    dd MB2_MODULE_ALIGN_TAG_END - MB2_MODULE_ALIGN_TAG_START
+MB2_MODULE_ALIGN_TAG_END:
+align 8
+MB2_TAG_START:
+    dw 0
+    dw 0
+    dd MB2_TAG_END - MB2_TAG_START
+MB2_TAG_END:
+HEADER_END:
diff --git a/Architecture/amd64/linker.ld b/Architecture/amd64/linker.ld
index bfaf98b..1820340 100644
--- a/Architecture/amd64/linker.ld
+++ b/Architecture/amd64/linker.ld
@@ -41,6 +41,8 @@ SECTIONS
     _bootstrap_start = .;
     .bootstrap :
     {
+        *(.multiboot)
+        *(.multiboot2)
         *(.bootstrap .bootstrap.*)
     } :bootstrap
     . += CONSTANT(MAXPAGESIZE);