diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 4618cc18e..9224cbbf3 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -89,12 +89,9 @@
     <!-- Support for compiling a keymap into the kernel is deliberately removed -->
 
     <para>For general information on kernel configuration see <ulink
-    url="&hints-root;kernel-configuration.txt"/>.  BLFS has some information
-    regarding particular kernel configuration requirements of packages outside
-    of LFS at <ulink
-    url="&blfs-book;longindex.html#kernel-config-index"/>.  Additional
+    url="&hints-root;kernel-configuration.txt"/>.  Additional
     information about configuring and building the kernel can be found at
-    <ulink url="http://www.kroah.com/lkn/"/> </para>
+    <ulink url="http://www.kroah.com/lkn/"/>.</para>
 
     <note>
       <para>A good starting place for setting up the kernel configuration is to
@@ -179,6 +176,23 @@ Device Drivers ---&gt;
     [*] Message Signaled Interrupts (MSI and MSI-X) [CONFIG_PCI_MSI]
   [*] IOMMU Hardware Support ---&gt; [CONFIG_IOMMU_SUPPORT]
     [*] Support for Interrupt Remapping [CONFIG_IRQ_REMAP]</screen>
+
+      <para>If you are building a 32-bit system running on a hardware
+      with RAM more than 4GB, adjust the configuration so the kernel will
+      be able to use up to 64GB physical RAM:</para>
+
+      <screen role="nodump">Processor type and features ---&gt;
+  High Memory Support ---&gt;
+    (X) 64GB [CONFIG_HIGHMEM64G]</screen>
+
+      <para>If the partition for the LFS system is in a NVME SSD (i. e. the
+      device node for the parition is <filename>/dev/nvme*</filename>
+      instead of <filename>/dev/sd*</filename>), enable NVME support or
+      the LFS system won't boot:</para>
+
+      <screen role="nodump">Device Drivers ---&gt;
+  NVME Support ---&gt;
+    &lt;*&gt; NVM Express block device [CONFIG_BLK_DEV_NVME]</screen>
     </note>
 
     <note revision="systemd">
@@ -186,18 +200,18 @@ Device Drivers ---&gt;
       required, it is highly recommended by the systemd developers.</para>
     </note>
 
-    <para revision="sysv">There are several other options that may be desired
+    <para>There are several other options that may be desired
     depending on the requirements for the system. For a list of options needed
     for BLFS packages, see the <ulink
     url="&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index">BLFS
-    Index of Kernel Settings</ulink>
-    (&lfs-root;blfs/view/&short-version;/longindex.html#kernel-config-index).</para>
+    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>.</para>
+      the BLFS page</ulink> <emphasis role='bold'>even if you'll use the
+      UEFI bootloader from the host distro</emphasis>.</para>
     </note>
 
     <variablelist>