diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8c7f023ac..b591a3109 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -33,6 +33,11 @@
 
 </para></listitem>
 
+<listitem><para>March 16th, 2002 [gerard]: Chapter 05+06 - Gawk: Added
+commands to sed the <filename>awklib/Makefile.in</filename> file to change
+the <emphasis>datadir</emphasis> and <emphasis>libexecdir</emphasis>
+definitions</para></listitem>
+
 <listitem><para>March 15th, 2002 [gerard]: Chapter 01 - Mailing lists:
 Added lfs-chat description</para></listitem>
 
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 8d59f24a0..0c216232f 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -7,7 +7,12 @@ following commands can be used in this case.  Note that these commands
 can also be used for other glibc versions so if you aren't sure, then
 use the first version.</para>
 
-<para><screen><userinput>export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
+<para><screen><userinput>cd awklib &amp;&amp;
+cp Makefile.in Makefile.in.backup &amp;&amp;
+sed -e '/^datadir/s/awk/gawk/' \
+-e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
+cd .. &amp;&amp;
+export CPPFLAGS=-Dre_max_failures=re_max_failures2 &amp;&amp;
 ./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
 unset CPPFLAGS &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
@@ -16,7 +21,12 @@ make install</userinput></screen></para>
 <para>If you are using a newer glibc version (2.2.x), you can use the
 following commands to install Gawk:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+<para><screen><userinput>cd awklib &amp;&amp;
+cp Makefile.in Makefile.in.backup &amp;&amp;
+sed -e '/^datadir/s/awk/gawk/' \
+-e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
+cd .. &amp;&amp;
+./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index dd602e051..c6d4a6067 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -3,7 +3,12 @@
 
 <para>Install Gawk by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>cd awklib &amp;&amp;
+cp Makefile.in Makefile.in.backup &amp;&amp;
+sed -e '/^datadir/s/awk/gawk/' \
+-e '/^libexecdir/s%/awk%%' Makefile.in.backup &gt; Makefile.in &amp;&amp;
+cd .. &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/index.xml b/index.xml
index 6c63307bc..c2cdde2de 100644
--- a/index.xml
+++ b/index.xml
@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20020315">
-<!ENTITY releasedate "March 15th, 2002">
+<!ENTITY version "20020316">
+<!ENTITY releasedate "March 16th, 2002">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">