diff --git a/doc/multiboot.texi b/doc/multiboot.texi
index a8f45e3..d251a51 100644
--- a/doc/multiboot.texi
+++ b/doc/multiboot.texi
@@ -602,6 +602,21 @@ u32     | size = 8          |
 
 If this tag is present modules must be page aligned.
 
+@node EFI boot services
+@subsection EFI boot services
+
+@example
+@group
+        +-------------------+
+u16     | type = 7          |
+u16     | flags             |
+u32     | size = 8          |
+        +-------------------+
+@end group
+@end example
+
+This tag indicates that payload supports starting without
+terminating boot services
 
 @node Machine state
 @section MIPS machine state
@@ -1143,6 +1158,18 @@ u32     | descriptor version|
 This tag contains EFI memory map as per EFI specification.
 
 
+@subsection EFI boot services not terminated
+@example
+@group
+        +-------------------+
+u32     | type = 18         |
+u32     | size = 8          |
+        +-------------------+
+@end group
+@end example
+
+This tag indicates FinishBootServices wasn't called
+
 @node Examples
 @chapter Examples
 
diff --git a/doc/multiboot2.h b/doc/multiboot2.h
index 58f2f68..272eeca 100644
--- a/doc/multiboot2.h
+++ b/doc/multiboot2.h
@@ -59,6 +59,7 @@
 #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_HEADER_TAG_END  0
 #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST  1
@@ -67,6 +68,7 @@
 #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_ARCHITECTURE_I386  0
 #define MULTIBOOT_ARCHITECTURE_MIPS32  4