diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index abc844af4..ecd583755 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -89,6 +89,15 @@ cd       build</userinput></screen>
 
     <para>Next, prepare Glibc for compilation:</para>
 
+<screen><userinput remap="configure">../configure                             \
+      --prefix=/usr                      \
+      --host=$LFS_TGT                    \
+      --build=$(../scripts/config.guess) \
+      --enable-kernel=&min-kernel;               \
+      --with-headers=$LFS/usr/include    \
+      --disable-nscd                     \
+      libc_cv_slibdir=/usr/lib</userinput></screen>
+<!--
 <screen arch="default"><userinput remap="configure">../configure                             \
       --prefix=/usr                      \
       --host=$LFS_TGT                    \
@@ -103,8 +112,9 @@ cd       build</userinput></screen>
       --build=$(../scripts/config.guess) \
       --enable-kernel=&min-kernel;                \
       --with-headers=$LFS/usr/include    \
-      --enable-multi-arch                \
+      --disable-nscd                     \
       libc_cv_slibdir=/usr/lib</userinput></screen>
+-->
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 5cb11042b..2539f7425 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -68,6 +68,13 @@ cd       build</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>
 
+<screen><userinput remap="configure">../configure --prefix=/usr                            \
+             --disable-werror                         \
+             --enable-kernel=&min-kernel;                     \
+             --enable-stack-protector=strong          \
+             --disable-nscd                           \
+             libc_cv_slibdir=/usr/lib</userinput></screen>
+<!--
 <screen arch="default"><userinput remap="configure">../configure --prefix=/usr                            \
              --disable-werror                         \
              --enable-kernel=&min-kernel;                     \
@@ -82,7 +89,7 @@ cd       build</userinput></screen>
              --with-headers=/usr/include              \
              --enable-multi-arch                      \
              libc_cv_slibdir=/usr/lib</userinput></screen>
-
+-->
     <variablelist>
       <title>The meaning of the configure options:</title>