3 files changed, 11 insertions, 6 deletions
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 74b39dc32..adeec10a4 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -39,11 +39,11 @@
 
   <sect2 role="installation">
     <title>Installation of Bash</title>
-<!--
+
     <para>Incorporate some upstream fixes:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
--->
+
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                    \
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index e7f1ee3cd..4af178726 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -46,7 +46,7 @@
 
     <para>Prepare Libelf for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-debuginfod</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -56,10 +56,13 @@
     
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>One test, run-elfclassify.sh, is known to fail.</para>
+
     <para>Install only Libelf:</para>
 
 <screen><userinput remap="install">make -C libelf install
-install -vm644 config/libelf.pc /usr/lib/pkgconfig</userinput></screen>
+install -vm644 config/libelf.pc /usr/lib/pkgconfig
+rm /usr/lib/libelf.a</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/libffi.xml b/chapter06/libffi.xml
index 360ddf521..6a6f8a458 100644
--- a/chapter06/libffi.xml
+++ b/chapter06/libffi.xml
@@ -49,7 +49,7 @@
       If this is not done, all applications that link to libffi will trigger
       Illegal Operation Errors.</para>
     </note>
-
+<!--
     <para>Modify the Makefile to install headers into the standard
     <filename class="directory">/usr/include</filename> directory instead of
     <filename class="directory">/usr/lib/libffi-&libffi-version;/include</filename>.</para>
@@ -60,7 +60,7 @@
 sed -e '/^includedir/ s/=.*$/=@includedir@/' \
     -e 's/^Cflags: -I${includedir}/Cflags:/' \
     -i libffi.pc.in</userinput></screen>
-
+-->
     <para>Prepare libffi for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --disable-static --with-gcc-arch=native</userinput></screen>
@@ -92,6 +92,8 @@ sed -e '/^includedir/ s/=.*$/=@includedir@/' \
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>Six tests, all related to test-callback.c, are known to fail.</para>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>