diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0bffa6e2d..10bb765bd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -112,6 +112,10 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 12th, 2005 [matt]: Change findutils and vim's configure
+switch explanations to the convention used in the rest of the book (Bug
+1613).</para></listitem>
+
 <listitem><para>August 12th, 2005 [matt]: Expand explanation of device node
 creation at the start of chapter 6.</para></listitem>
 
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 0c34ac14b..61674c1e9 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -38,9 +38,16 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make and Sed</seg></seglistitem>
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
     --localstatedir=/var/lib/locate</userinput></screen>
 
-<para>The <parameter>localstatedir</parameter> option above changes the
-location of the <command>locate</command> database to be in <filename
-class="directory">/var/lib/locate</filename>, which is FHS-compliant.</para>
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--localstatedir</parameter></term>
+<listitem><para>This option changes the location of the <command>locate</command>
+database to be in <filename class="directory">/var/lib/locate</filename>, which
+is FHS-compliant.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index dd8940c9f..299ea6e23 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -55,13 +55,19 @@ addressed upstream.  The following patch fixes the problems:</para>
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-<para>The optional but highly recommended
-<parameter>--enable-multibyte</parameter> switch includes support for
-editing files in multibyte character encodings into
-<command>vim</command>.  This is needed if using a locale with
-a multibyte character set. This switch is also helpful to be able to
-edit text files initially created in Linux distributions like Fedora
-Core that use UTF-8 as a default character set.</para>
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--enable-multibyte</parameter></term>
+<listitem><para>This optional but highly recommended switch enables support for
+editing files in multibyte character encodings.  This is needed if using a
+locale with a multibyte character set. This switch is also helpful to be able to
+edit text files initially created in Linux distributions like Fedora Core that
+use UTF-8 as a default character set.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>