diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e0a19fbd8..5ce9883ae 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
 
 -->
 
+    <listitem>
+      <para>2008-10-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Added a configure option to the Chapter 6 Gettext
+          instructions so that the documentation is installed in a versioned
+          directory.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-10-12</para>
       <itemizedlist>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index dff95ba3f..0bce337ac 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -45,18 +45,18 @@
 
     <para>Prepare Gettext for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+            --docdir=/usr/share/doc/gettext-&gettext-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results, issue:</para>
+    <para>To test the results (this takes a long time, around 3 SBUs),
+    issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>This takes a long time, around 3 SBUs.</para>
-
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/general.ent b/general.ent
index 5525b1a10..9372fcb6f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20081012">
-<!ENTITY releasedate "October 12, 2008">
+<!ENTITY version "SVN-20081013">
+<!ENTITY releasedate "October 13, 2008">
 <!ENTITY copyrightdate "1999&ndash;2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->