diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index 74970e226..75751fea1 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -66,7 +66,7 @@
 
   <para>If you are using an existing <systemitem class="filesystem">swap
   </systemitem> partition, there is no need to format it. If a new
-  <systemitem class="filesystem"> swap</systemitem> partition was created,
+  <systemitem class="filesystem">swap</systemitem> partition was created,
   it will need to be initialized with this command:</para>
 
 <screen role="nodump"><userinput>mkswap /dev/<replaceable>&lt;yyy&gt;</replaceable></userinput></screen>
@@ -74,4 +74,23 @@
   <para>Replace <replaceable>&lt;yyy&gt;</replaceable> with the name of the
   <systemitem class="filesystem">swap</systemitem> partition.</para>
 
+  <para>If you have created an EFI System Partition, you have a few options.
+  Motherboards when booting with UEFI look for EFI applications in partitions
+  formatted with a FAT variant (FAT12, FAT16, FAT32, VFAT, etc).  Usually,
+  FAT32 or VFAT are the recommended options.</para>
+
+  <para>If you have chosen <systemitem class="filesystem">FAT32</systemitem>,
+  format the ESP with the following command:</para>
+
+<screen role="nodump"><userinput>mkfs.fat -F 32 /dev/<replaceable>&lt;yyy&gt;</replaceable></userinput></screen>
+
+  <para>On the other hand, if you have chosen
+  <systemitem class="filesystem">VFAT</systemitem>, you can run the following
+  instead:</para>
+
+<screen role="nodump"><userinput>mkfs.vfat /dev/<replaceable>&lt;yyy&gt;</replaceable></userinput></screen>
+
+  <para>Replace <replaceable>&lt;yyy&gt;</replaceable> with the name of the
+  EFI System Partition.</para>
+
 </sect1>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index f5bb244cb..bdafd5da5 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -109,11 +109,16 @@
 
     <para>If the <emphasis>boot disk</emphasis> has been partitioned with a
     GUID Partition Table (GPT), then a small, typically 1 MB, partition must be
-    created if it does not already exist.  This partition is not formatted, but
-    must be available for GRUB to use during installation of the boot
-    loader. This partition will normally be labeled 'BIOS Boot' if using
-    <command>fdisk</command> or have a code of <emphasis>EF02</emphasis> if
-    using the <command>gdisk</command> command.</para>
+    created if the system is being booted with BIOS and it does not already
+    exist.  This partition is not formatted, but must be available for GRUB to
+    use during installation of the boot loader.  This partition will normally
+    be labeled 'BIOS Boot' if using <command>fdisk</command> or have a code of
+    <emphasis>EF02</emphasis> if using the <command>gdisk</command>
+    command.</para>
+
+    <para>If the boot disk is partitioned with an MBR Partition Table, or DOS
+    disklabel, then this partition is not needed as space already exists before
+    the first partition that Grub can use.</para>
 
     <note><para>The Grub Bios partition must be on the drive that the BIOS
     uses to boot the system.  This is not necessarily the drive that holds
@@ -122,6 +127,23 @@
     only on the partition table type of the boot disk.</para></note>
     </sect3>
 
+    <sect3>
+    <title>The EFI System Partition</title>
+
+    <para>This partition, also known as the <emphasis>ESP</emphasis>, is needed
+    when booting the system with UEFI.  It stores the EFI application that is
+    ran during bootup.  The boot drive can be partitioned with MBR Partition
+    Table, or DOS, but compatibility issues will tend to arise as a result.
+    Therefore, it is always a good idea in this case to partition the boot
+    drive with a GUID Partition Table (GPT). Typically 256 MB for this
+    partition suffices, although the needed size for a Grub EFI application can
+    go down to 20 MB or lower. The partition label should be 'EFI System' if
+    using <command>fdisk</command>.</para>
+
+    <para>For Grub, the EFI System Partion should be located at
+    /boot/efi.</para>
+    </sect3>
+
     <sect3>
     <title>Convenience Partitions</title>
 
@@ -137,11 +159,6 @@
       your first disk drive.  A partition size of 200 megabytes is
       adequate.</para></listitem>
 
-      <listitem><para>/boot/efi &ndash; The EFI System Partition, which is
-      needed for booting the system with UEFI.  Read
-      <ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>
-      for details.</para></listitem>
-
       <listitem><para>/home &ndash; Highly recommended.  Share your home
       directory and user customization across multiple distributions or LFS
       builds.  The size is generally fairly large and depends on available disk