diff --git a/appendixa/gawk-shortdesc.xml b/appendixa/gawk-shortdesc.xml
index 200b114d8..67dd53c06 100644
--- a/appendixa/gawk-shortdesc.xml
+++ b/appendixa/gawk-shortdesc.xml
@@ -5,7 +5,7 @@
 <para>Gawk is an awk implementation that is used to manipulate text
 files.</para>
 
-<para><emphasis>Installed programs</emphasis>: awk, gawk, gawk-&gawk-version;,
-grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat</para>
+<para><emphasis>Installed programs</emphasis>: awk (link to gawk), gawk,
+gawk-&gawk-version;, grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat</para>
 
 </sect2>
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index b3eeafcb7..d5b5dd9d7 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -3,32 +3,28 @@
 <sect2>
 <title>Installation of Gawk</title>
 
-<para>Before installing the Gawk package you have to apply a patch,
-which fixes the following issues:</para>
+<para>First apply a patch to fix the following issues:</para>
 
 <itemizedlist>
-<listitem><para>Gawk's default location for libexecdir is <filename
-class="directory">$prefix/libexecdir/awk</filename>. This location doesn't
-comply with FHS (which never mentions a directory called
-libexecdir).</para></listitem>
+<listitem><para>Gawk's default location for some of its executables is
+<filename>$prefix/libexec/awk</filename>. This location doesn't comply
+with the FHS, which never even mentions a directory called
+<filename>libexec</filename>. The patch makes it possible to pass a
+<emphasis>--libexecdir</emphasis> switch to the configure script, so that we
+can use a more appropriate location for the <userinput>grcat</userinput> and
+<userinput>pwcat</userinput> binaries:
+<filename>/usr/bin</filename>.</para></listitem>
 
-<listitem><para>The patch allows us to pass
-<emphasis>--libexecdir</emphasis> to the configure script (without gawk
-tacking on /awk to the end), so that we can use a more appropriate location
-for gawk's libexecdir (<filename class="directory">/usr/bin</filename> in
-the book).</para></listitem>
+<listitem><para>Gawk's default data directory is
+<filename>$prefix/share/awk</filename>. But package-specific
+directories should be named using the package name and version number
+(for example: <filename>gawk-7.7.2.</filename>) and not simply the package
+name, as there may be different versions of a package installed on the system.
+The patch changes the name of the data directory to the correct
+<filename>$prefix/share/gawk-&gawk-version;</filename>.</para></listitem>
 
-<listitem><para>The default data directory for gawk is <filename
-class="directory">$prefix/share/awk</filename>. A package specific
-directory should be named using the package and version (like
-gawk-&gawk-version; instead of awk) because there may be more than one awk
-interpreter on a system (and more than one version of gawk). The patch changes
-this to <filename class="directory">$prefix/share/gawk-&gawk-version;</filename>
-to be more correct.</para></listitem>
-
-<listitem><para>The patch ensures that this directory (<filename
-class="directory">$prefix/share/gawk-&gawk-version;</filename>) is removed along
-with its contents on a make uninstall.</para></listitem>
+<listitem><para>The patch also ensures that this data directory, including its
+contents, is removed on a <emphasis>make uninstall</emphasis>.</para></listitem>
 </itemizedlist>
 
 <screen><userinput>patch -Np1 -i ../&gawk-patch;</userinput></screen>