diff --git a/bootscripts/lfs/init.d/swap b/bootscripts/lfs/init.d/swap
index 9747024c5..14075ae19 100644
--- a/bootscripts/lfs/init.d/swap
+++ b/bootscripts/lfs/init.d/swap
@@ -20,8 +20,8 @@
 # Should-Stop:         $local_fs
 # Default-Start:       S
 # Default-Stop:        0 6
-# Short-Description:   Mounts and unmounts swap partitions.
-# Description:         Mounts and unmounts swap partitions defined in
+# Short-Description:   Activates and deactivates swap partitions.
+# Description:         Activates and deactivates swap partitions defined in
 #                      /etc/fstab.
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 2a2d29fc9..419faa264 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -308,12 +308,18 @@ File systems  --->
     the <filename class="directory">/boot</filename> directory.</para>
 
     <caution>
-      <para>If the host system has a separate /boot partition, the files copied
-      below should go there. The easiest way to do that is to bind /boot on the
-      host (outside chroot) to /mnt/lfs/boot before proceeding.  As the
-      &root; user in the <emphasis>host system</emphasis>:</para>
+      <para>If you've decided to use a separate &boot-dir; partition for the
+      LFS system (maybe sharing a &boot-dir; partition with the host
+      distro) , the files copied below should go there. The easiest way to
+      do that is to create the entry for &boot-dir; in &fstab; first (read
+      the previous section for details), then issue the following command
+      as the &root; user in the
+      <emphasis>chroot environment</emphasis>:</para>
 
-<screen role="nodump"><userinput>mount --bind /boot /mnt/lfs/boot</userinput></screen>
+<screen role="nodump"><userinput>mount /boot</userinput></screen>
+
+      <para>The path to the device node is omitted in the command because
+      <command>mount</command> can read it from &fstab;.</para>
     </caution>
 
     <para>The path to the kernel image may vary depending on the platform being
diff --git a/general.ent b/general.ent
index 9670bc57f..f5e413cd8 100644
--- a/general.ent
+++ b/general.ent
@@ -122,6 +122,7 @@
 <!ENTITY root            "<systemitem class='username'>root</systemitem>">
 <!ENTITY lfs-user        "<systemitem class='username'>lfs</systemitem>">
 <!ENTITY fstab           "<filename>/etc/fstab</filename>">
+<!ENTITY boot-dir        "<filename class='directory'>/boot</filename>">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;