diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8e1932c51..4ce8ca8a5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem>
+      <para>2017-05-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix the build for i686 systems. Includes a
+          modification to Chapter 06 Glibc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2017-05-19</para>
       <itemizedlist>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index cdcdf2e47..5ef90aaeb 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -67,7 +67,7 @@
     required for the dynamic loader to function correctly:</para>
 
 <screen><userinput remap="pre">case $(uname -m) in
-    x86)    GCC_INCDIR=/usr/lib/gcc/x86-pc-linux-gnu/&gcc-version;/include
+    i?86)    GCC_INCDIR=/usr/lib/gcc/$(uname -m)-pc-linux-gnu/&gcc-version;/include
             ln -s ld-linux.so.2 /lib/ld-lsb.so.3
     ;;
     x86_64) GCC_INCDIR=/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
diff --git a/general.ent b/general.ent
index 6719c684c..fd187d26a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20170518">
+<!ENTITY version         "SVN-20170525">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20170518-systemd">
+<!ENTITY versiond        "20170525-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 18, 2017">
+<!ENTITY releasedate     "May 25, 2017">
 
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.1">