diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6f8833874..f6c39ab3b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -114,6 +114,11 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>November 14, 2005 [jhuntwork]: Only install <command>msgfmt</command>
+from gettext in chapter 5. This is all that is necessary and prevents gettext
+from trying to pull in unnecessary elements from the host. Thanks to Greg Schafer
+for pointing this out.</para></listitem>
+
 <listitem><para>November 12, 2005 [matt]: Improve the heuristic for determining
 a locale that is supported by both Glibc and packages outside LFS (bug 1642).
 Many thanks to Alexander Patrakov for highlighting the numerous issues and for
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 7957209ac..422ffb022 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -27,44 +27,31 @@
 <sect2 role="installation">
 <title>Installation of Gettext</title>
 
+<para>For our temporary set of tools, we only need to build and install one binary from gettext.</para>
+
 <para>Prepare Gettext for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools --disable-libasprintf \
-    --without-csharp</userinput></screen>
+<screen><userinput>cd gettext-tools
+./configure --prefix=/tools --disable-shared</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
 <variablelist>
 <varlistentry>
-<term><parameter>--disable-libasprintf</parameter></term>
-<listitem><para>This flag tells Gettext not to build the
-<filename class="libraryfile">asprintf</filename> library. Because nothing in this 
-chapter or the next requires this library and Gettext gets rebuilt later,
-exclude it to save time and space.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--without-csharp</parameter></term>
-<listitem><para>This ensures that Gettext does not build support for the C#
-compiler which may be present on the host but will not be available once we
-enter the <command>chroot</command> environment.</para></listitem>
+<term><parameter>--disable-shared</parameter></term>
+<listitem><para>We are not installing any of the gettext libraries at this
+time so we need to build <command>msgfmt</command> as a static binary.</para></listitem>
 </varlistentry>
 </variablelist>
 
 <para>Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make -C lib
+make -C src msgfmt</userinput></screen>
 
-<para>To test the results, issue: <userinput>make check</userinput>.
-This takes quite some time, around 7 SBUs. The Gettext test suite is
-known to experience failures under certain host conditions, for
-example when it finds a Java compiler on the host.  An experimental
-patch to disable Java is available from the LFS Patches project at
-<ulink url="&lfs-root;patches/"/>.</para>
+<para>Install the single static binary:</para>
 
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
+<screen><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
 
 </sect2>
 
diff --git a/general.ent b/general.ent
index bc4fc29ed..cd39cef33 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20051112">
-<!ENTITY releasedate "November 12, 2005">
+<!ENTITY version "SVN-20051114">
+<!ENTITY releasedate "November 14, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->