diff --git a/include/multiboot.h b/include/multiboot.h
index 556e6bf..b77f5f7 100644
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -1,5 +1,5 @@
-/* multiboot.h - Multiboot header file. */
-/* Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
+/*  multiboot2.h - Multiboot 2 header file.  */
+/*  Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to
@@ -23,74 +23,73 @@
 #ifndef MULTIBOOT_HEADER
 #define MULTIBOOT_HEADER 1
 
-/* How many bytes from the start of the file we search for the header. */
-#define MULTIBOOT_SEARCH 8192
-#define MULTIBOOT_HEADER_ALIGN 4
+/* How many bytes from the start of the file we search for the header.  */
+#define MULTIBOOT_SEARCH 32768
+#define MULTIBOOT_HEADER_ALIGN 8
 
-/* The magic field should contain this. */
-#define MULTIBOOT_HEADER_MAGIC 0x1BADB002
+/* The magic field should contain this.  */
+#define MULTIBOOT2_HEADER_MAGIC 0xe85250d6
 
-/* This should be in %eax. */
-#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
+/* This should be in %eax.  */
+#define MULTIBOOT2_BOOTLOADER_MAGIC 0x36d76289
 
-/* Alignment of multiboot modules. */
+/* Alignment of multiboot modules.  */
 #define MULTIBOOT_MOD_ALIGN 0x00001000
 
-/* Alignment of the multiboot info structure. */
-#define MULTIBOOT_INFO_ALIGN 0x00000004
-
-/* Flags set in the 'flags' member of the multiboot header. */
-
-/* Align all boot modules on i386 page (4KB) boundaries. */
-#define MULTIBOOT_PAGE_ALIGN 0x00000001
-
-/* Must pass memory information to OS. */
-#define MULTIBOOT_MEMORY_INFO 0x00000002
-
-/* Must pass video information to OS. */
-#define MULTIBOOT_VIDEO_MODE 0x00000004
-
-/* This flag indicates the use of the address fields in the header. */
-#define MULTIBOOT_AOUT_KLUDGE 0x00010000
-
-/* Flags to be set in the 'flags' member of the multiboot info structure. */
-
-/* is there basic lower/upper memory information? */
-#define MULTIBOOT_INFO_MEMORY 0x00000001
-/* is there a boot device set? */
-#define MULTIBOOT_INFO_BOOTDEV 0x00000002
-/* is the command-line defined? */
-#define MULTIBOOT_INFO_CMDLINE 0x00000004
-/* are there modules to do something with? */
-#define MULTIBOOT_INFO_MODS 0x00000008
-
-/* These next two are mutually exclusive */
-
-/* is there a symbol table loaded? */
-#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010
-/* is there an ELF section header table? */
-#define MULTIBOOT_INFO_ELF_SHDR 0X00000020
-
-/* is there a full memory map? */
-#define MULTIBOOT_INFO_MEM_MAP 0x00000040
-
-/* Is there drive info? */
-#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080
-
-/* Is there a config table? */
-#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100
-
-/* Is there a boot loader name? */
-#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200
-
-/* Is there a APM table? */
-#define MULTIBOOT_INFO_APM_TABLE 0x00000400
-
-/* Is there video information? */
-#define MULTIBOOT_INFO_VBE_INFO 0x00000800
-#define MULTIBOOT_INFO_FRAMEBUFFER_INFO 0x00001000
-
-#ifndef __ASSEMBLER__
+/* Alignment of the multiboot info structure.  */
+#define MULTIBOOT_INFO_ALIGN 0x00000008
+
+/* Flags set in the 'flags' member of the multiboot header.  */
+
+#define MULTIBOOT_TAG_ALIGN 8
+#define MULTIBOOT_TAG_TYPE_END 0
+#define MULTIBOOT_TAG_TYPE_NONE 0 /* Custom for convenience */
+#define MULTIBOOT_TAG_TYPE_CMDLINE 1
+#define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME 2
+#define MULTIBOOT_TAG_TYPE_MODULE 3
+#define MULTIBOOT_TAG_TYPE_BASIC_MEMINFO 4
+#define MULTIBOOT_TAG_TYPE_BOOTDEV 5
+#define MULTIBOOT_TAG_TYPE_MMAP 6
+#define MULTIBOOT_TAG_TYPE_VBE 7
+#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8
+#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9
+#define MULTIBOOT_TAG_TYPE_APM 10
+#define MULTIBOOT_TAG_TYPE_EFI32 11
+#define MULTIBOOT_TAG_TYPE_EFI64 12
+#define MULTIBOOT_TAG_TYPE_SMBIOS 13
+#define MULTIBOOT_TAG_TYPE_ACPI_OLD 14
+#define MULTIBOOT_TAG_TYPE_ACPI_NEW 15
+#define MULTIBOOT_TAG_TYPE_NETWORK 16
+#define MULTIBOOT_TAG_TYPE_EFI_MMAP 17
+#define MULTIBOOT_TAG_TYPE_EFI_BS 18
+#define MULTIBOOT_TAG_TYPE_EFI32_IH 19
+#define MULTIBOOT_TAG_TYPE_EFI64_IH 20
+#define MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR 21
+
+#define MULTIBOOT_HEADER_TAG_END 0
+#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1
+#define MULTIBOOT_HEADER_TAG_ADDRESS 2
+#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS 3
+#define MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS 4
+#define MULTIBOOT_HEADER_TAG_FRAMEBUFFER 5
+#define MULTIBOOT_HEADER_TAG_MODULE_ALIGN 6
+#define MULTIBOOT_HEADER_TAG_EFI_BS 7
+#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI32 8
+#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9
+#define MULTIBOOT_HEADER_TAG_RELOCATABLE 10
+
+#define MULTIBOOT_ARCHITECTURE_I386 0
+#define MULTIBOOT_ARCHITECTURE_MIPS32 4
+#define MULTIBOOT_HEADER_TAG_OPTIONAL 1
+
+#define MULTIBOOT_LOAD_PREFERENCE_NONE 0
+#define MULTIBOOT_LOAD_PREFERENCE_LOW 1
+#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2
+
+#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
+#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
+
+#ifndef ASM_FILE
 
 typedef unsigned char multiboot_uint8_t;
 typedef unsigned short multiboot_uint16_t;
@@ -98,96 +97,167 @@ typedef unsigned int multiboot_uint32_t;
 typedef unsigned long long multiboot_uint64_t;
 
 struct multiboot_header {
-    /* Must be MULTIBOOT_MAGIC - see above. */
+    /* Must be MULTIBOOT_MAGIC - see above.  */
     multiboot_uint32_t magic;
 
-    /* Feature flags. */
-    multiboot_uint32_t flags;
+    /* ISA */
+    multiboot_uint32_t architecture;
+
+    /* Total header length.  */
+    multiboot_uint32_t header_length;
 
     /* The above fields plus this one must equal 0 mod 2^32. */
     multiboot_uint32_t checksum;
+};
 
-    /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
+struct multiboot_header_tag {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
+};
+
+struct multiboot_header_tag_information_request {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
+    multiboot_uint32_t requests[0];
+};
+
+struct multiboot_header_tag_address {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
     multiboot_uint32_t header_addr;
     multiboot_uint32_t load_addr;
     multiboot_uint32_t load_end_addr;
     multiboot_uint32_t bss_end_addr;
+};
+
+struct multiboot_header_tag_entry_address {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
     multiboot_uint32_t entry_addr;
+};
+
+struct multiboot_header_tag_console_flags {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
+    multiboot_uint32_t console_flags;
+};
 
-    /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
-    multiboot_uint32_t mode_type;
+struct multiboot_header_tag_framebuffer {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
     multiboot_uint32_t width;
     multiboot_uint32_t height;
     multiboot_uint32_t depth;
 };
 
-/* The symbol table for a.out. */
-struct multiboot_aout_symbol_table {
-    multiboot_uint32_t tabsize;
-    multiboot_uint32_t strsize;
-    multiboot_uint32_t addr;
-    multiboot_uint32_t reserved;
+struct multiboot_header_tag_module_align {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
+    multiboot_uint32_t size;
 };
-typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
 
-/* The section header table for ELF. */
-struct multiboot_elf_section_header_table {
-    multiboot_uint32_t num;
+struct multiboot_header_tag_relocatable {
+    multiboot_uint16_t type;
+    multiboot_uint16_t flags;
     multiboot_uint32_t size;
-    multiboot_uint32_t addr;
-    multiboot_uint32_t shndx;
+    multiboot_uint32_t min_addr;
+    multiboot_uint32_t max_addr;
+    multiboot_uint32_t align;
+    multiboot_uint32_t preference;
 };
-typedef struct multiboot_elf_section_header_table
-    multiboot_elf_section_header_table_t;
 
-struct multiboot_info {
-    /* Multiboot info version number */
-    multiboot_uint32_t flags;
+struct multiboot_color {
+    multiboot_uint8_t red;
+    multiboot_uint8_t green;
+    multiboot_uint8_t blue;
+};
 
-    /* Available memory from BIOS */
-    multiboot_uint32_t mem_lower;
-    multiboot_uint32_t mem_upper;
+struct multiboot_mmap_entry {
+    multiboot_uint64_t addr;
+    multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE 1
+#define MULTIBOOT_MEMORY_RESERVED 2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3
+#define MULTIBOOT_MEMORY_NVS 4
+#define MULTIBOOT_MEMORY_BADRAM 5
+    multiboot_uint32_t type;
+    multiboot_uint32_t zero;
+};
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
 
-    /* "root" partition */
-    multiboot_uint32_t boot_device;
+struct multiboot_tag {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+};
 
-    /* Kernel command line */
-    multiboot_uint32_t cmdline;
+struct multiboot_tag_string {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    char string[0];
+};
 
-    /* Boot-Module list */
-    multiboot_uint32_t mods_count;
-    multiboot_uint32_t mods_addr;
+struct multiboot_tag_module {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t mod_start;
+    multiboot_uint32_t mod_end;
+    char cmdline[0];
+};
 
-    union {
-        multiboot_aout_symbol_table_t aout_sym;
-        multiboot_elf_section_header_table_t elf_sec;
-    } u;
+struct multiboot_tag_basic_meminfo {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t mem_lower;
+    multiboot_uint32_t mem_upper;
+};
 
-    /* Memory Mapping buffer */
-    multiboot_uint32_t mmap_length;
-    multiboot_uint32_t mmap_addr;
+struct multiboot_tag_bootdev {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t biosdev;
+    multiboot_uint32_t slice;
+    multiboot_uint32_t part;
+};
 
-    /* Drive Info buffer */
-    multiboot_uint32_t drives_length;
-    multiboot_uint32_t drives_addr;
+struct multiboot_tag_mmap {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t entry_size;
+    multiboot_uint32_t entry_version;
+    struct multiboot_mmap_entry entries[0];
+};
 
-    /* ROM configuration table */
-    multiboot_uint32_t config_table;
+struct multiboot_vbe_info_block {
+    multiboot_uint8_t external_specification[512];
+};
 
-    /* Boot Loader Name */
-    multiboot_uint32_t boot_loader_name;
+struct multiboot_vbe_mode_info_block {
+    multiboot_uint8_t external_specification[256];
+};
 
-    /* APM table */
-    multiboot_uint32_t apm_table;
+struct multiboot_tag_vbe {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
 
-    /* Video */
-    multiboot_uint32_t vbe_control_info;
-    multiboot_uint32_t vbe_mode_info;
     multiboot_uint16_t vbe_mode;
     multiboot_uint16_t vbe_interface_seg;
     multiboot_uint16_t vbe_interface_off;
     multiboot_uint16_t vbe_interface_len;
 
+    struct multiboot_vbe_info_block vbe_control_info;
+    struct multiboot_vbe_mode_info_block vbe_mode_info;
+};
+
+struct multiboot_tag_framebuffer_common {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+
     multiboot_uint64_t framebuffer_addr;
     multiboot_uint32_t framebuffer_pitch;
     multiboot_uint32_t framebuffer_width;
@@ -197,10 +267,16 @@ struct multiboot_info {
 #define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
 #define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
     multiboot_uint8_t framebuffer_type;
+    multiboot_uint16_t reserved;
+};
+
+struct multiboot_tag_framebuffer {
+    struct multiboot_tag_framebuffer_common common;
+
     union {
         struct {
-            multiboot_uint32_t framebuffer_palette_addr;
             multiboot_uint16_t framebuffer_palette_num_colors;
+            struct multiboot_color framebuffer_palette[0];
         };
         struct {
             multiboot_uint8_t framebuffer_red_field_position;
@@ -212,42 +288,19 @@ struct multiboot_info {
         };
     };
 };
-typedef struct multiboot_info multiboot_info_t;
-
-struct multiboot_color {
-    multiboot_uint8_t red;
-    multiboot_uint8_t green;
-    multiboot_uint8_t blue;
-};
 
-struct multiboot_mmap_entry {
-    multiboot_uint32_t size;
-    multiboot_uint64_t addr;
-    multiboot_uint64_t len;
-#define MULTIBOOT_MEMORY_AVAILABLE 1
-#define MULTIBOOT_MEMORY_RESERVED 2
-#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3
-#define MULTIBOOT_MEMORY_NVS 4
-#define MULTIBOOT_MEMORY_BADRAM 5
+struct multiboot_tag_elf_sections {
     multiboot_uint32_t type;
-} __attribute__((packed));
-typedef struct multiboot_mmap_entry multiboot_memory_map_t;
-
-struct multiboot_mod_list {
-    /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
-    multiboot_uint32_t mod_start;
-    multiboot_uint32_t mod_end;
-
-    /* Module command line */
-    multiboot_uint32_t cmdline;
-
-    /* padding to take it to 16 bytes (must be zero) */
-    multiboot_uint32_t pad;
+    multiboot_uint32_t size;
+    multiboot_uint32_t num;
+    multiboot_uint32_t entsize;
+    multiboot_uint32_t shndx;
+    char sections[0];
 };
-typedef struct multiboot_mod_list multiboot_module_t;
 
-/* APM BIOS info. */
-struct multiboot_apm_info {
+struct multiboot_tag_apm {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
     multiboot_uint16_t version;
     multiboot_uint16_t cseg;
     multiboot_uint32_t offset;
@@ -259,6 +312,71 @@ struct multiboot_apm_info {
     multiboot_uint16_t dseg_len;
 };
 
+struct multiboot_tag_efi32 {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t pointer;
+};
+
+struct multiboot_tag_efi64 {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint64_t pointer;
+};
+
+struct multiboot_tag_smbios {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint8_t major;
+    multiboot_uint8_t minor;
+    multiboot_uint8_t reserved[6];
+    multiboot_uint8_t tables[0];
+};
+
+struct multiboot_tag_old_acpi {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint8_t rsdp[0];
+};
+
+struct multiboot_tag_new_acpi {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint8_t rsdp[0];
+};
+
+struct multiboot_tag_network {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint8_t dhcpack[0];
+};
+
+struct multiboot_tag_efi_mmap {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t descr_size;
+    multiboot_uint32_t descr_vers;
+    multiboot_uint8_t efi_mmap[0];
+};
+
+struct multiboot_tag_efi32_ih {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t pointer;
+};
+
+struct multiboot_tag_efi64_ih {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint64_t pointer;
+};
+
+struct multiboot_tag_load_base_addr {
+    multiboot_uint32_t type;
+    multiboot_uint32_t size;
+    multiboot_uint32_t load_base_addr;
+};
+
 #define FOREACH_MULTIBOOT_MODULE(_iter, _mbt)                            \
     for (multiboot_module_t *_iter = (void *)(_mbt)->mods_addr;          \
          _iter <                                                         \
diff --git a/kernel/arch/i686/crt0.S b/kernel/arch/i686/crt0.S
index 560cc59..d86807f 100644
--- a/kernel/arch/i686/crt0.S
+++ b/kernel/arch/i686/crt0.S
@@ -9,12 +9,27 @@
  */
 
 #define MULTIBOOT_HEADER_FLAGS (MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO)
+#define MULTIBOOT_HEADER_SIZE (.multiboot_header_end - .multiboot_header_start)
 
 .section .multiboot
 .align MULTIBOOT_HEADER_ALIGN
-.long MULTIBOOT_HEADER_MAGIC
-.long MULTIBOOT_HEADER_FLAGS
-.long -(MULTIBOOT_HEADER_FLAGS + MULTIBOOT_HEADER_MAGIC)
+.multiboot_header_start:
+.long MULTIBOOT2_HEADER_MAGIC
+.long MULTIBOOT_ARCHITECTURE_I386
+.long MULTIBOOT_HEADER_SIZE
+.long -(MULTIBOOT_HEADER_SIZE + MULTIBOOT_ARCHITECTURE_I386 + MULTIBOOT2_HEADER_MAGIC)
+
+#define MULTIBOOT_TAG(type, flag, size) \
+    .align MULTIBOOT_TAG_ALIGN \
+    .word MULTIBOOT_HEADER_ ## type \
+    .word MULTIBOOT_TAG_TYPE_ ## flag \
+    .long size
+
+MULTIBOOT_TAG(INFORMATION_REQUEST, MMAP
+MULTIBOOT_TAG(MODULE_ALIGN, NONE, 0)
+MULTIBOOT_TAG(END, END, 6)
+
+.multiboot_header_end:
 
 /*
  * The stack, required by C functions and not defined by default.
diff --git a/scripts/generate_iso.sh b/scripts/generate_iso.sh
index 2aa26aa..5da3de2 100755
--- a/scripts/generate_iso.sh
+++ b/scripts/generate_iso.sh
@@ -15,7 +15,7 @@ KERNEL_ISO="$2"
 #   $1 - path to the kernel executable
 function check_multiboot()
 {
-    if ! grub-file --is-x86-multiboot "$1"; then
+    if ! grub-file --is-x86-multiboot2 "$1"; then
         echo "error: The provided kernel executable is not multiboot compliant ($1)" >&2
         exit 2
     fi
@@ -41,8 +41,8 @@ function generate_iso()
     cat <<EOF > "$iso_dir/boot/grub/grub.cfg"
 set timeout=0
 menuentry "Kernel - ${KERNEL_BIN%.*}" {
-    multiboot /boot/$(basename "$KERNEL_BIN")
-    module /boot/initramfs.tar
+    multiboot2 /boot/$(basename "$KERNEL_BIN")
+    module2 /boot/initramfs.tar
 }
 EOF