diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 049627925..1e325aaca 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,7 +41,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>File &file-version;</para></listitem>
 <listitem><para>Findutils &findutils-version;</para></listitem>
 <!-- <listitem><para>Flex &flex-version;</para></listitem> -->
-<!-- <listitem><para>Gawk &gawk-version;</para></listitem> -->
+<listitem><para>Gawk &gawk-version;</para></listitem>
 <listitem><para>GCC &gcc-version;</para></listitem>
 <listitem><para>Gettext &gettext-version;</para></listitem>
 <listitem><para>Glibc &glibc-version;</para></listitem>
@@ -90,6 +90,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>&bzip2-bzgrep-patch;</para></listitem>
 <listitem><para>&bzip2-docs-patch;</para></listitem>
 <listitem><para>&coreutils-echo-patch;</para></listitem>
+<listitem><para>&gawk-segfault-patch;</para></listitem>
 <listitem><para>&gcc-specs-patch;</para></listitem>
 <listitem><para>&glibc-gcc4_elf-patch;</para></listitem>
 <listitem><para>&glibc-gcc4_iconvdata-patch;</para></listitem>
@@ -121,6 +122,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 24, 2005 [matt]: Upgrade to gawk-3.1.5.</para>
+</listitem>
+
 <listitem><para>September 24, 2005 [matt]: Upgrade to man-1.6b.</para>
 </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 557f47e33..f92e6dc5c 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -80,6 +80,13 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Gawk Segfault Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&gawk-segfault-patch;"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>GCC Specs Patch - 14 KB:</term>
 <listitem>
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 675d5e077..ef363424e 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -33,6 +33,12 @@
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
+<para>The configure script doesn't detect some functionality correctly.  The
+following commands correct this problem:</para>
+
+<screen><userinput>echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
+echo "#define HAVE_LC_MESSAGES 1" >> config.h</userinput></screen>
+
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 2f361a9d6..6430c7a3f 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -30,10 +30,21 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Gawk</title>
 
+<para>Patch Gawk to fix a bug which causes it to segfault when invoked on a
+non-existent file:</para>
+
+<screen><userinput>patch -Np1 -i ../&gawk-segfault-patch;</userinput></screen>
+
 <para>Prepare Gawk for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
 
+<para>The configure script doesn't detect some functionality correctly.  The
+following commands correct this problem:</para>
+
+<screen><userinput>echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
+echo "#define HAVE_LC_MESSAGES 1" >> config.h</userinput></screen>
+
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/general.ent b/general.ent
index c4ce10037..d86352b40 100644
--- a/general.ent
+++ b/general.ent
@@ -39,7 +39,7 @@
 <!ENTITY file-version "4.15">
 <!ENTITY findutils-version "4.2.25">
 <!ENTITY flex-version "2.5.31">
-<!ENTITY gawk-version "3.1.4">
+<!ENTITY gawk-version "3.1.5">
 <!ENTITY gcc-version "4.0.1">
 <!ENTITY gettext-version "0.14.5">
 <!ENTITY glibc-version "2.3.5">
diff --git a/patches.ent b/patches.ent
index 2a6b0c776..c357807d0 100644
--- a/patches.ent
+++ b/patches.ent
@@ -15,6 +15,8 @@
 
 <!ENTITY flex-fixes-patch "flex-&flex-version;-debian_fixes-3.patch">
 
+<!ENTITY gawk-segfault-patch "gawk-&gawk-version;-segfault_fix-1.patch">
+
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
 
 <!ENTITY glibc-testfix-patch "glibc-&glibc-version;-fix_test-1.patch">