diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml
index e16efdea9..c7020290d 100644
--- a/chapter05/libstdc++.xml
+++ b/chapter05/libstdc++.xml
@@ -60,13 +60,13 @@ cd       build</userinput></screen>
 
     <para>Prepare Libstdc++ for compilation:</para>
 
-<screen><userinput remap="configure">../libstdc++-v3/configure           \
-    --host=$LFS_TGT                 \
-    --build=$(../config.guess)      \
-    --prefix=/usr                   \
-    --disable-multilib              \
-    --disable-nls                   \
-    --disable-libstdcxx-pch         \
+<screen><userinput remap="configure">../libstdc++-v3/configure      \
+    --host=$LFS_TGT            \
+    --build=$(../config.guess) \
+    --prefix=/usr              \
+    --disable-multilib         \
+    --disable-nls              \
+    --disable-libstdcxx-pch    \
     --with-gxx-include-dir=/tools/$LFS_TGT/include/c++/&gcc-version;</userinput></screen>
 
     <variablelist>
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index 6d0098c80..478462c78 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -83,23 +83,23 @@ cd       build</userinput></screen>
 
     <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">../configure                                       \
-    --build=$(../config.guess)                     \
-    --host=$LFS_TGT                                \
-    --target=$LFS_TGT                              \
-    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
-    --prefix=/usr                                  \
-    --with-build-sysroot=$LFS                      \
-    --enable-default-pie                           \
-    --enable-default-ssp                           \
-    --disable-nls                                  \
-    --disable-multilib                             \
-    --disable-libatomic                            \
-    --disable-libgomp                              \
-    --disable-libquadmath                          \
-    --disable-libsanitizer                         \
-    --disable-libssp                               \
-    --disable-libvtv                               \
+<screen><userinput remap="configure">../configure                   \
+    --build=$(../config.guess) \
+    --host=$LFS_TGT            \
+    --target=$LFS_TGT          \
+    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \
+    --prefix=/usr              \
+    --with-build-sysroot=$LFS  \
+    --enable-default-pie       \
+    --enable-default-ssp       \
+    --disable-nls              \
+    --disable-multilib         \
+    --disable-libatomic        \
+    --disable-libgomp          \
+    --disable-libquadmath      \
+    --disable-libsanitizer     \
+    --disable-libssp           \
+    --disable-libvtv           \
     --enable-languages=c,c++</userinput></screen>
 
     <variablelist>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 67bc22540..691094e12 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -45,8 +45,8 @@
 
     <para>Prepare Tar for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                     \
-            --host=$LFS_TGT                   \
+<screen><userinput remap="configure">./configure --prefix=/usr   \
+            --host=$LFS_TGT \
             --build=$(build-aux/config.guess)</userinput></screen>
 
     <para>Compile the package:</para>
diff --git a/chapter08/acl.xml b/chapter08/acl.xml
index 63892d68e..f122deda1 100644
--- a/chapter08/acl.xml
+++ b/chapter08/acl.xml
@@ -44,8 +44,8 @@
 
     <para>Prepare Acl for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr         \
-            --disable-static      \
+<screen><userinput remap="configure">./configure --prefix=/usr    \
+            --disable-static \
             --docdir=/usr/share/doc/acl-&acl-version;</userinput></screen>
 
     <para>Compile the package:</para>
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 6f93dc99e..89f1fadb3 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -52,12 +52,12 @@ cd       build</userinput></screen>
 
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr           \
-             --sysconfdir=/etc       \
-             --enable-elf-shlibs     \
-             --disable-libblkid      \
-             --disable-libuuid       \
-             --disable-uuidd         \
+<screen><userinput remap="configure">../configure --prefix=/usr       \
+             --sysconfdir=/etc   \
+             --enable-elf-shlibs \
+             --disable-libblkid  \
+             --disable-libuuid   \
+             --disable-uuidd     \
              --disable-fsck</userinput></screen>
 
     <variablelist>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index a04bc8ac3..fb6b346a0 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -68,12 +68,12 @@ cd       build</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr                            \
-             --disable-werror                         \
-             --enable-kernel=&min-kernel;                     \
-             --enable-stack-protector=strong          \
-             --disable-nscd                           \
-             libc_cv_slibdir=/usr/lib</userinput></screen>
+<screen><userinput remap="configure">../configure --prefix=/usr       \
+             --disable-werror    \
+             --disable-nscd      \
+             --enable-kernel=&min-kernel;\
+             libc_cv_slibdir=/usr/lib \
+             --enable-stack-protector=strong</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index b301d4f5a..d12e6bce2 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -71,9 +71,9 @@
 
     <para>Prepare GRUB for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --disable-efiemu       \
+<screen><userinput remap="configure">./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-efiemu  \
             --disable-werror</userinput></screen>
 
     <variablelist>
diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index 68ccf2b42..117d0bd66 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -46,8 +46,8 @@
 
     <para>Prepare Libelf for compilation:</para>
 
-    <screen><userinput remap="configure">./configure --prefix=/usr                \
-            --disable-debuginfod         \
+    <screen><userinput remap="configure">./configure --prefix=/usr        \
+            --disable-debuginfod \
             --enable-libdebuginfod=dummy</userinput></screen>
 
     <para>Compile the package:</para>
diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index f15d08b07..8d7509f3c 100644
--- a/chapter08/libffi.xml
+++ b/chapter08/libffi.xml
@@ -63,8 +63,8 @@
 
     <para>Prepare Libffi for compilation:</para>
 
-    <screen><userinput remap="configure">./configure --prefix=/usr          \
-            --disable-static       \
+<screen><userinput remap="configure">./configure --prefix=/usr    \
+            --disable-static \
             --with-gcc-arch=native</userinput></screen>
 
     <variablelist>
diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml
index 3e7e737fa..d9f9c4da3 100644
--- a/chapter08/pkgconf.xml
+++ b/chapter08/pkgconf.xml
@@ -46,8 +46,8 @@
 
     <para>Prepare Pkgconf for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr              \
-            --disable-static           \
+<screen><userinput remap="configure">./configure --prefix=/usr    \
+            --disable-static \
             --docdir=/usr/share/doc/pkgconf-&pkgconf-version;</userinput></screen>
 
     <para>Compile the package:</para>