diff -Naur BOOK/chapter03/patches.xml LFS/chapter03/patches.xml
--- BOOK/chapter03/patches.xml	2012-03-15 17:02:48.878311901 +0000
+++ LFS/chapter03/patches.xml	2012-03-22 21:23:49.345134797 +0000
@@ -90,14 +90,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Glibc GCC CPUID Patch - <token>&glibc-cpuid-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-cpuid-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-cpuid-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
 <!--
     <varlistentry>
       <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
diff -Naur BOOK/chapter05/glibc.xml LFS/chapter05/glibc.xml
--- BOOK/chapter05/glibc.xml	2012-03-13 21:41:36.741983818 +0000
+++ LFS/chapter05/glibc.xml	2012-03-22 21:22:44.332758625 +0000
@@ -50,7 +50,11 @@
     <para>Also address a header check that fails due to an incomplete build 
     environment at this point:</para>
 
-    <screen><userinput remap="pre">patch -Np1 -i ../&glibc-cpuid-patch;</userinput></screen>
+    <screen><userinput remap="pre">sed -i 's#$ac_includes_default#\n\n#' sysdeps/i386/configure</userinput></screen>
+
+    <para>Fix a path that is hardcoded:</para>
+
+    <screen><userinput remap="pre">sed -i 's#/var/db#/tools/var/db#' Makeconfig</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
@@ -83,7 +87,8 @@
       --enable-kernel=2.6.25                          \
       --with-headers=/tools/include                   \
       libc_cv_forced_unwind=yes                       \
-      libc_cv_c_cleanup=yes</userinput></screen>
+      libc_cv_c_cleanup=yes                           \
+      libc_cv_ctors_header=yes</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -151,6 +156,14 @@
           cleanup handling support is configured.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><parameter>libc_cv_ctors_header=yes</parameter></term>
+        <listitem>
+          <para>Simlarly, we pass libc_cv_ctors_header=yes through to the
+          <command>configure</command> script so that the test is skipped and 
+          gcc constructor support is configured.</para>
+        </listitem>
+      </varlistentry>
 
     </variablelist>
 
diff -Naur BOOK/packages.ent LFS/packages.ent
--- BOOK/packages.ent	2012-03-15 17:02:48.934977711 +0000
+++ LFS/packages.ent	2012-03-22 20:29:01.763495249 +0000
@@ -201,9 +201,9 @@
 <!ENTITY gettext-ch6-du "125 MB">
 <!ENTITY gettext-ch6-sbu "5.8 SBU">
 
-<!ENTITY glibc-version "2.14.1">
+<!ENTITY glibc-version "2.15">
 <!ENTITY glibc-size "15,284 KB">
-<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
 <!ENTITY glibc-md5 "5869a2620c6917dd392289864c6ce595">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "501 MB">