Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/final-system/common/bash.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -29,4 +29,9 @@
 
 <screen os="b"><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz</userinput></screen>
+
+    <para os="p1">The following patch contains updates from the maintainer. The
+    maintainer of Bash only releases these patches to fix serious issues.:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
     <para os="g">Prepare Bash for compilation:</para>
Index: BOOK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/final-system/common/ncurses.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -25,8 +25,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <para os="p1">This patch addresses build issues with Bash &bash-version;:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bash-patch;</userinput></screen>
 
     <para os="a">Prepare Ncurses for compilation:</para>
Index: BOOK/final-system/multilib/bash.xml
===================================================================
--- BOOK/final-system/multilib/bash.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/final-system/multilib/bash.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -29,4 +29,12 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-64bit.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/final-system/multilib/ncurses-64bit.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
Index: BOOK/final-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-n32.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/final-system/multilib/ncurses-n32.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
Index: BOOK/final-system/multilib/ncurses.xml
===================================================================
--- BOOK/final-system/multilib/ncurses.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/final-system/multilib/ncurses.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
 <screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/introduction/common/changelog.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>October 15, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated Bash 3.2 with some unofficial upstream fixes. Thank you Chet Ramsey.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 12, 2006</para>
       <itemizedlist>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/materials/common/patches.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -20,4 +20,13 @@
 
     <varlistentry>
+      <term>Bash 3.2 Fixes - <token>&bash-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&bash-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Binutils Posix Patch - <token>&binutils-posix-patch-size;</token>:</term>
       <listitem>
@@ -196,13 +205,4 @@
         url="&patches-root;&mktemp-tempfile-patch;"/></para>
         <para>MD5 sum: <literal>&mktemp-tempfile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses Bash 3.2 Fix - <token>&ncurses-bash-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&ncurses-bash-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-bash-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/patches.ent	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -5,7 +5,7 @@
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-8.patch">
-<!ENTITY bash-fixes-patch-md5 "bc337045fa4c5839babf0306cc9df6d0">
-<!ENTITY bash-fixes-patch-size "23 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "51dcdc97fa978199329f12d382056d91">
+<!ENTITY bash-fixes-patch-size "4 KB">
 
 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">
@@ -93,8 +93,4 @@
 <!ENTITY mktemp-tempfile-patch-size "3.6 KB">
 
-<!ENTITY ncurses-bash-patch "ncurses-&ncurses-version;-bash32_update-1.patch">
-<!ENTITY ncurses-bash-patch-md5 "fca13124063dc74925bbdaec364f14dd">
-<!ENTITY ncurses-bash-patch-size "4 KB">
-
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-2.patch">
 <!ENTITY perl-libc-patch-md5 "3bf8aef1fb6eb6110405e699e4141f99">
Index: BOOK/temp-system/64/ncurses.xml
===================================================================
--- BOOK/temp-system/64/ncurses.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/temp-system/64/ncurses.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/temp-system/common/bash.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/bash.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="c1">Remove a test that causes the build to fail:</para>
Index: BOOK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/temp-system/common/ncurses.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/bash.xml
===================================================================
--- BOOK/temp-system/multilib/bash.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/temp-system/multilib/bash.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision 663b0fde5248d67f7bfd98eddef68aec70722c52)
+++ BOOK/temp-system/multilib/ncurses.xml	(revision 6f9ab646b18ff210c2782be54a1adadaddf48aae)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
