diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index cbd3456b4..1ac142dde 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -80,6 +80,12 @@ esac</userinput></screen>
     -i.orig gcc/config/i386/t-linux64
 </userinput></screen>
 
+    <para arch="ml_32,ml_all">Make <literal>-mstackrealign</literal> a default for 32bit
+      objects:</para>
+
+<screen arch="ml_32,ml_all"><userinput remap="pre">sed '/STACK_REALIGN_DEFAULT/s/0/(!TARGET_64BIT \&amp;\&amp; TARGET_SSE)/' \
+      -i gcc/config/i386/i386.h</userinput></screen>
+
     <para>The GCC documentation recommends building GCC
     in a dedicated build directory:</para>
 
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index db4e73605..4d4b27ca9 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -75,6 +75,12 @@ esac</userinput></screen>
     -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
+    <para arch="ml_32,ml_all">Make <literal>-mstackrealign</literal> a default for 32bit
+      objects:</para>
+
+<screen arch="ml_32,ml_all"><userinput remap="pre">sed '/STACK_REALIGN_DEFAULT/s/0/(!TARGET_64BIT \&amp;\&amp; TARGET_SSE)/' \
+      -i gcc/config/i386/i386.h</userinput></screen>
+
     <para>Override the building rule of libgcc and libstdc++ headers, to
     allow building these libraries with POSIX threads support:</para>
 
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 641cf890c..4624443c6 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -58,6 +58,12 @@ esac</userinput></screen>
     -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
+    <para arch="ml_32,ml_all">Make <literal>-mstackrealign</literal> a default for 32bit
+      objects:</para>
+
+<screen arch="ml_32,ml_all"><userinput remap="pre">sed '/STACK_REALIGN_DEFAULT/s/0/(!TARGET_64BIT \&amp;\&amp; TARGET_SSE)/' \
+      -i gcc/config/i386/i386.h</userinput></screen>
+
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
 
 <screen><userinput remap="pre">mkdir -v build
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 03d427031..ed79fc887 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -624,8 +624,7 @@ find .. -name "*.a" -delete</userinput></screen>
 
     <para>Configure Glibc for m32 with the following commands:</para>
 
-<screen><userinput remap="configure">CC="gcc -m32 -mstackrealign" \
-CXX="g++ -m32 -mstackrealign" \
+<screen><userinput remap="configure">CC="gcc -m32" CXX="g++ -m32" \
 ../configure                             \
       --prefix=/usr                      \
       --host=i686-pc-linux-gnu           \
@@ -636,40 +635,6 @@ CXX="g++ -m32 -mstackrealign" \
       --libexecdir=/usr/lib32            \
       libc_cv_slibdir=/usr/lib32</userinput></screen>
 
-    <para>Adding the <literal>-mstackrealign</literal> flag helps to
-      overcome issues with old binaries which cannot be recompiled
-      on the actual OS. Those issues were reported for 
-      <application>Steam</application>.</para>
-
-    <!-- Thanks to xry111 for explaining the technical background: -->
-    <para>Today the x86-32 SysV psABI (used by all Linux programs)
-      mandates a 16-byte alignment of the stack frame, so the routines
-      using SSE will save/load SSE vectors onto/from the stack using a
-      <literal>movaps</literal> instruction (which only works with
-      aligned addresses, but faster than its counterpart allowing
-      unaligned addresses, <literal>movups</literal>).</para>
-    <para>But some really old x86-32 Linux binaries (compiled about
-      15 years ago), and all Windows x86-32 binaries only aligns the
-      stack frame to 4-byte. Thus, when it calls a SSE routine in LFS
-      built without <literal>-mstackrealign</literal>, the
-      <literal>movdqa</literal> instruction fails with a General
-      Protection Error and the Linux kernel terminates the process
-      with a SIGSEGV.</para>
-    <para>It is not clear why this seems to be an issue with Glibc only.
-      <command>gcc -m32</command> does <emphasis>not</emphasis> turn off SSE (because
-      it means "building a 32-bit program for x86_64" instead of
-      "building a program for i686," and all x86_64 CPU have SSE), so
-      every library can use SSE. <application>Steam</application> has
-      an issue here, but <application>Wine</application> has not.
-      Maybe <application>Wine</application> evades the issue by building
-      most libraries as Windows DLLs using <application>mingw-gcc</application> (which enables
-      <literal>-mstackrealign</literal> by default) instead of relying
-      on the system library, but it still uses the system libc.</para>
-    <para>In theory, the <literal>-mstackrealign</literal> should be
-      applied for all m32 libraries but actually, the only issue
-      reported so far can be fixed by adding it to glibc in the above
-      command only.</para>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>