diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index d84b0f5b8..d6f9cf584 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -203,7 +203,7 @@ ver_check()
 
 ver_kernel()
 {
-   kver=$(uname -r | grep -E -o '[0-9\.]+')
+   kver=$(uname -r | grep -E -o '^[0-9\.]+')
    if printf '%s\n' $1 $kver | sort --version-sort --check &>/dev/null
    then 
      printf "OK:    Linux Kernel $kver >= $1\n"; return 0;
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 5ea3deae9..a168d6518 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -89,35 +89,16 @@
     <!-- 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>
 
-    <caution>
+    <note>
       <para>A good starting place for setting up the kernel configuration is to
-      run <command>make localmodconfig</command>. If the host kernel version
-      is not too different from the version of the kernel you are building,
-      this will set the base configuration to a good state similar to what
-      the host uses. Another possibility is to use <command>make
-      localyesconfig</command>, which does the same except everything is built
-      into the kernel.</para>
+      run <command>make defconfig</command>. This will set the base
+      configuration to a good state that takes your current system architecture
+      into account.</para>
 
-      <para>Do not disable any option enabled by <command>make
-      localmodconfig</command> unless the following notes explicitly make it
-      disabled or you really know what you are doing.</para>
-    </caution>
-
-    <note>
-      <para>Another possibility is to run <command>make defconfig</command>,
-      which creates a more generic configuration for your architecture. You
-      may then have to disable drivers for hardware you do not have if
-      you want to reduce the kernel size.</para>
-    </note>
-
-    <note>
       <para>Be sure to enable/disable/set the following features or the system might
       not work correctly or boot at all:</para>
 
@@ -195,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">
@@ -202,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>
 
     <note arch="ml_32,ml_x32,ml_all">
@@ -354,7 +352,7 @@ Device Drivers ---&gt;
           <para>Support running the interrupt controller of 64-bit x86
           processors in x2APIC mode.  x2APIC may be enabled by firmware on
           64-bit x86 systems, and a kernel without this option enabled will
-          panic on boot if x2APIC is enabled by firmware.  This option
+          panic on boot if x2APIC is enabled by firmware.  This option has
           has no effect, but also does no harm if x2APIC is disabled by the
           firmware.</para>
         </listitem>