diff --git a/chapter10/fstab.xml b/chapter10/fstab.xml
index 47253f56c..ac34348d8 100644
--- a/chapter10/fstab.xml
+++ b/chapter10/fstab.xml
@@ -70,33 +70,46 @@ EOF</userinput></screen>
   interpreted in the UTF-8 locale.</para>
 
   <para>
-    When booting with UEFI, the ESP must be formatted as a FAT filesystem, most
+    When installing GRUB with UEFI, the ESP must be formatted as a FAT filesystem, most
     commonly VFAT. This file sees it as VFAT regardless. An example of how you
     would go about an entry for the ESP would look like this:
   </para>
 
 <screen><userinput>cat &gt;&gt; /etc/fstab &lt;&lt; "EOF"
-<literal>/dev/<replaceable>&lt;zzz&gt;</replaceable>     /boot/efi    vfat     rw,relatime,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 0 2</literal>
+<literal>/dev/<replaceable>&lt;zzz&gt;</replaceable>  /boot/efi  vfat  rw,relatime,codepage=437,iocharset=iso8859-1   0   2</literal>
 EOF</userinput></screen>
 
   <para>
-    The <literal>iso8859-1</literal> IO charset is used here since UEFI
-    firmware implementations search for <filename
-    class="directory">\EFI\BOOT\BOOT...EFI</filename>, which in a
-    case-sensitive environment would not be satisfied. So that charset is used
-    to ensure the EFI image can be found.
+    The <literal>iso8859-1</literal> IO charset is used here as we'll
+    enable it as a part of the kernel UEFI configuration in
+    <xref linkend='ch-bootable-kernel'/>.  Technically the IO charset should
+    match your locale as we've discussed above.  However the name of all the
+    files in the ESP only contains 7-bit ASCII characters, so things will
+    be OK as long as the character set for your locale treats 7-bit ASCII
+    characters in the same way as ISO-8859-1.  For example, UTF-8 is such
+    a character set.
   </para>
 
-  <!--note>
-    <para>In the latter case, the kernel emits the following message:</para>
+  <note>
+    <para>
+      The EFI filesystem only needs to be mounted when installing GRUB.  
+      The system uses this partition before the kernel is loaded and is not used
+      otherwise.  An alternative to adding this entry to the fstab file is to
+      manually mount it before running <command>grub-install</command> below
+      in <xref linkend="ch-bootable-grub"/>.
+    </para>
+  </note>
 
+<!--<para>In the latter case, the kernel emits the following message:</para>
+
+    <note>
 <screen><computeroutput>FAT: utf8 is not a recommended IO charset for FAT filesystems,
     filesystem will be case sensitive!</computeroutput></screen>
 
     <para>This negative recommendation should be ignored, since all other values
     of the <quote>iocharset</quote> option result in wrong display of filenames in
     UTF-8 locales.</para>
-  </note-->
+  </note>-->
 
   <para>It is also possible to specify default codepage and iocharset values for
   some filesystems during kernel configuration. The relevant parameters