diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index a2ac15011..69e098daa 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -40,6 +40,16 @@
   <sect2 role="installation">
     <title>Installation of GRUB</title>
 
+    <note>
+      <para>
+        If your system has UEFI support and you wish to boot LFS with UEFI,
+        you can skip this package in LFS,
+        and install GRUB with UEFI support (and its dependencies) following
+        <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
+        at the end of this chapter.
+      </para>
+    </note>
+
     <para>Prepare GRUB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index 356cb4105..f54dbd2f9 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -16,6 +16,15 @@
 
   <title>Using GRUB to Set Up the Boot Process</title>
 
+  <note>
+    <para>
+      If your system has UEFI support and you wish to boot LFS with UEFI,
+      you should skip this page, and config GRUB with UEFI support
+      using the instructions provided in
+      <ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>.
+    </para>
+  </note>
+
   <sect2>
     <title>Introduction</title>
 
@@ -37,19 +46,6 @@
 grub-mkrescue --output=grub-img.iso 
 xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></screen>
 
-    <note>
-      <para>
-        To boot LFS on host systems that have UEFI enabled, the kernel needs to
-        have been built with the CONFIG_EFI_STUB capability described in the
-        previous section.  However, LFS can be booted using GRUB2 without such
-        an addition. To do this, the UEFI Mode and Secure Boot capabilities in
-        the host system's BIOS need to be turned off.  For details, see <ulink
-        url="&hints-root;lfs-uefi.txt">
-        the lfs-uefi.txt hint</ulink> at
-        &hints-root;lfs-uefi.txt.
-      </para>
-    </note>
-
   </sect2>
 
   <sect2>
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index d3bd90695..1a2861856 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -149,21 +149,10 @@ File systems  ---&gt;
     (&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index).</para>
 
     <note>
-      <para>If your host hardware is using UEFI, then the 'make defconfig'
-      above should automatically add in some EFI-related kernel options.</para>
-
-      <para>In order to allow your LFS kernel to be booted from within your
-      host's UEFI boot environment, your kernel must have this option
-      selected:</para>
-
-<screen role="nodump">Processor type and features  ---&gt;
-   [*]   EFI stub support  [CONFIG_EFI_STUB]</screen>
-
-      <para>A fuller description of managing UEFI environments from within LFS
-      is covered by the lfs-uefi.txt hint at
-      <ulink 
-        url="&hints-root;lfs-uefi.txt"/>.
-      </para>
+      <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>.</para>
     </note>
 
     <variablelist>