diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index b1abbde5c..fd0f3ac21 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -161,14 +161,6 @@
     url="&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index">BLFS
     Index of Kernel Settings</ulink>.</para>
 
-    <note>
-      <para>If your host hardware is using UEFI and you wish to boot the
-      LFS system with it, you should adjust some kernel configuration
-      following <ulink url="&blfs-book;postlfs/grub-setup.html#uefi-kernel">
-      the BLFS page</ulink> <emphasis role='bold'>even if you'll use the
-      UEFI bootloader from the host distro</emphasis>.</para>
-    </note>
-
     <variablelist>
       <title>The rationale for the above configuration items:</title>
 
diff --git a/chapter10/kernel/systemd.toml b/chapter10/kernel/systemd.toml
index 387a74b66..17a261a4f 100644
--- a/chapter10/kernel/systemd.toml
+++ b/chapter10/kernel/systemd.toml
@@ -33,6 +33,9 @@ CGROUP_SCHED='* '
 
 revision='systemd'
 
+EFI='*'
+EFI_ZBOOT='*'
+
 [RT_GROUP_SCHED]
 value = ' '
 comment = 'This may cause some systemd features malfunction'
diff --git a/chapter10/kernel/systemd.xml b/chapter10/kernel/systemd.xml
index cc85b32c6..5f5ef6d07 100644
--- a/chapter10/kernel/systemd.xml
+++ b/chapter10/kernel/systemd.xml
@@ -21,6 +21,9 @@
   [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel image                             [RELOCATABLE]
   [*] <emphasis role='blue'>R</emphasis>andomize the address of the kernel image                 [RANDOMIZE_BASE]
 
+<emphasis role='blue'>B</emphasis>oot options ---&gt;
+  [*] <emphasis role='blue'>U</emphasis>EFI runtime support                                                 [EFI]
+
 <emphasis role='blue'>G</emphasis>eneral architecture-dependent options ---&gt;
   [*] <emphasis role='blue'>S</emphasis>tack Protector buffer overflow detection                 [STACKPROTECTOR]
   [*]   <emphasis role='blue'>S</emphasis>trong Stack Protector                           [STACKPROTECTOR_STRONG]
@@ -43,6 +46,8 @@
   <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
     [*] <emphasis role='blue'>E</emphasis>xport DMI identification via sysfs to userspace                 [DMIID]
     [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
+    <emphasis role='blue'>E</emphasis>FI (Extensible Firmware Interface) Support ---&gt;
+      [*] <emphasis role='blue'>E</emphasis>nable the generic EFI decompressor                        [EFI_ZBOOT]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]
diff --git a/chapter10/kernel/sysv.toml b/chapter10/kernel/sysv.toml
index c8267a303..a0c4b99d5 100644
--- a/chapter10/kernel/sysv.toml
+++ b/chapter10/kernel/sysv.toml
@@ -20,4 +20,7 @@ DRM_FBDEV_EMULATION='*'
 DRM_SIMPLEDRM='*'
 FRAMEBUFFER_CONSOLE='*'
 
+EFI='*'
+EFI_ZBOOT='*'
+
 revision='sysv'
diff --git a/chapter10/kernel/sysv.xml b/chapter10/kernel/sysv.xml
index 8a9a6a35c..cfb1ac29f 100644
--- a/chapter10/kernel/sysv.xml
+++ b/chapter10/kernel/sysv.xml
@@ -18,6 +18,9 @@
   [*] <emphasis role='blue'>B</emphasis>uild a relocatable kernel image                             [RELOCATABLE]
   [*] <emphasis role='blue'>R</emphasis>andomize the address of the kernel image                 [RANDOMIZE_BASE]
 
+<emphasis role='blue'>B</emphasis>oot options ---&gt;
+  [*] <emphasis role='blue'>U</emphasis>EFI runtime support                                                 [EFI]
+
 <emphasis role='blue'>G</emphasis>eneral architecture-dependent options ---&gt;
   [*] <emphasis role='blue'>S</emphasis>tack Protector buffer overflow detection                 [STACKPROTECTOR]
   [*]   <emphasis role='blue'>S</emphasis>trong Stack Protector                           [STACKPROTECTOR_STRONG]
@@ -30,6 +33,8 @@
                                                            ...  [DEVTMPFS_MOUNT]
   <emphasis role='blue'>F</emphasis>irmware Drivers ---&gt;
     [*] M<emphasis role='blue'>a</emphasis>rk VGA/VBE/EFI FB as generic system framebuffer       [SYSFB_SIMPLEFB]
+    <emphasis role='blue'>E</emphasis>FI (Extensible Firmware Interface) Support ---&gt;
+      [*] <emphasis role='blue'>E</emphasis>nable the generic EFI decompressor                        [EFI_ZBOOT]
   <emphasis role='blue'>G</emphasis>raphics support ---&gt;
     &lt;*&gt; <emphasis role='blue'>D</emphasis>irect Rendering Manager (XFree86 4.1.0 and higher DRI support) ---&gt;
                                                                       ...  [DRM]