diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index e17c2fc92..a0410f9f3 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -53,7 +53,7 @@
     linker and assembler to determine which of their own features to
     enable.</para>
 
-    <para>The Binutils documentation recommends building Binutils 
+    <para>The Binutils documentation recommends building Binutils
     in a dedicated build directory:</para>
 
 <screen><userinput remap="pre">mkdir -v build
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 0cd852ee6..1ff7d50fe 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -72,7 +72,7 @@ mv -v mpc-&mpc-version; mpc</userinput></screen>
  ;;
 esac</userinput></screen>
 
-    <para>The GCC documentation recommends building GCC 
+    <para>The GCC documentation recommends building GCC
     in a dedicated build directory:</para>
 
 <screen><userinput remap="pre">mkdir -v build
@@ -107,7 +107,7 @@ cd       build</userinput></screen>
         <term><parameter>--with-glibc-version=2.11</parameter></term>
         <listitem>
           <para>This option ensures the package will be compatible with the host's
-          version of glibc.  It is set to the minimum glibc requirement 
+          version of glibc.  It is set to the minimum glibc requirement
           specified in the <xref linkend="ch-partitioning-hostreqs"/>.</para>
         </listitem>
       </varlistentry>
@@ -159,7 +159,7 @@ cd       build</userinput></screen>
 
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
-              --disable-libatomic, --disable-libgomp, 
+              --disable-libatomic, --disable-libgomp,
         --disable-libquadmath, --disable-libssp, --disable-libvtv,
         --disable-libstdcxx</parameter></term>
         <listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 37a222bd1..e3503a958 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -62,7 +62,7 @@ esac</userinput></screen>
 
 <screen><userinput remap="pre">patch -Np1 -i ../glibc-&glibc-version;-fhs-1.patch</userinput></screen>
 
-    <para>The Glibc documentation recommends building Glibc 
+    <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
 
 <screen><userinput remap="pre">mkdir -v build
@@ -139,7 +139,7 @@ cd       build</userinput></screen>
     generally harmless. This <command>msgfmt</command> program is part of the
     Gettext package which the host distribution should provide.</para>
 
-    <note><para>There have been reports that this package may fail when 
+    <note><para>There have been reports that this package may fail when
     building as a "parallel make".  If this occurs, rerun the make command
     with a "-j1" option.</para></note>
 
diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index 68da1f7c2..750868591 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -24,7 +24,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>Libstdc++ is the standard C++ library. It is needed 
+    <para>Libstdc++ is the standard C++ library. It is needed
     to compile C++ code
     (part of GCC is written in C++), but we had to defer its installation
     when we built <xref linkend="ch-tools-gcc-pass1"/>
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index 213fe7dc3..24415bf55 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -75,12 +75,12 @@ rm usr/include/Makefile
       <seglistitem>
         <seg>/usr/include/asm/*.h, /usr/include/asm-generic/*.h,
         /usr/include/drm/*.h, /usr/include/linux/*.h, /usr/include/misc/*.h,
-        /usr/include/mtd/*.h, /usr/include/rdma/*.h, /usr/include/scsi/*.h, 
-        /usr/include/sound/*.h, /usr/include/video/*.h, 
+        /usr/include/mtd/*.h, /usr/include/rdma/*.h, /usr/include/scsi/*.h,
+        /usr/include/sound/*.h, /usr/include/video/*.h,
         and /usr/include/xen/*.h</seg>
         <seg>/usr/include/asm, /usr/include/asm-generic, /usr/include/drm,
-        /usr/include/linux, /usr/include/misc, /usr/include/mtd, 
-        /usr/include/rdma, /usr/include/scsi, /usr/include/sound, 
+        /usr/include/linux, /usr/include/misc, /usr/include/mtd,
+        /usr/include/rdma, /usr/include/scsi, /usr/include/sound,
         /usr/include/video, and /usr/include/xen</seg>
       </seglistitem>
     </segmentedlist>