diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index a8b59ea1e..4839256b7 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -44,7 +44,7 @@
     <title>Installation of Gettext</title>
 
     <para>For our temporary set of tools, we only need to build and install
-    one binary from Gettext.</para>
+    three binaries from Gettext.</para>
 
     <para>Prepare Gettext for compilation:</para>
 
@@ -76,7 +76,9 @@ EMACS="no" ./configure --prefix=/tools --disable-shared</userinput></screen>
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
+make -C src msgfmt
+make -C src msgmerge
+make -C src xgettext</userinput></screen>
 
     <para>As only one binary has been compiled, it is not possible to run the
     test suite without compiling additional support libraries from the Gettext
@@ -85,7 +87,7 @@ make -C src msgfmt</userinput></screen>
 
     <para>Install the <command>msgfmt</command> binary:</para>
 
-<screen><userinput remap="install">cp -v src/msgfmt /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index 597ac4a06..b5e2fcfae 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -62,7 +62,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install install-dev install-lib &amp;&amp;
+<screen><userinput remap="install">make install install-dev install-lib
 chmod -v 0755 /lib/libattr.so.1.1.0</userinput></screen>
 
     <para>Remove static library and libtool archive from
@@ -74,7 +74,7 @@ chmod -v 0755 /lib/libattr.so.1.1.0</userinput></screen>
     <para>Change default location for the libtool archive and recreate
     symlink to shared library since it points to removed file:</para>
 
-<screen><userinput remap="install">sed -i 's@/lib@/usr/lib@' /usr/lib/libattr.la &amp;&amp;
+<screen><userinput remap="install">sed -i 's@/lib@/usr/lib@' /usr/lib/libattr.la
 ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
 
   </sect2>
diff --git a/chapter06/expat.xml b/chapter06/expat.xml
index a7df8ee72..0ed85ac41 100644
--- a/chapter06/expat.xml
+++ b/chapter06/expat.xml
@@ -59,7 +59,7 @@
 
     <para>If desired, install the documentation:</para>
 
-<screen><userinput remap="install">install -v -dm755 /usr/share/doc/expat-&expat-version; &amp;&amp;
+<screen><userinput remap="install">install -v -dm755 /usr/share/doc/expat-&expat-version;
 install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
 
   </sect2>
@@ -85,7 +85,6 @@ install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</user
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="xmlwf">
-         <!-- Don't remove the extra space, it prevents a FOP warning. -->
         <term><command>xmlwf </command></term>
         <listitem>
           <para>is a non-validating utility to check whether or not
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 12fa8b417..503c0159d 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -176,7 +176,7 @@ cp -v ../glibc-&glibc-version;/nis/rpcsvc/*.h /usr/include/rpcsvc</userinput></s
     <para>Install the configuration file and runtime directory for
     <command>nscd</command>:</para>
 
-<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf &amp;&amp;
+<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
 mkdir -pv /var/cache/nscd</userinput></screen>
 
     <para>The locales that can make the system respond in a different language
diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml
index 9c31a1206..148a41de2 100644
--- a/chapter06/intltool.xml
+++ b/chapter06/intltool.xml
@@ -55,7 +55,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install &amp;&amp;
+<screen><userinput remap="install">make install
 install -v -m644 -D doc/I18N-HOWTO \
   /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
 
diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml
index f1fec6f3a..43f842fe8 100644
--- a/chapter06/libcap.xml
+++ b/chapter06/libcap.xml
@@ -51,7 +51,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install &amp;&amp;
+<screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install
 chmod -v 0755 /usr/lib/libcap.so.2.22</userinput></screen>
 
     <para>The shared library needs to be moved to
@@ -59,7 +59,7 @@ chmod -v 0755 /usr/lib/libcap.so.2.22</userinput></screen>
     <filename class="extension">.so</filename> file in
     <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
 
-<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib &amp;&amp;
+<screen><userinput remap="install">mv -v /usr/lib/libcap.so.* /lib
 ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 
   </sect2>