Index: final-system/common/glibc.xml
===================================================================
--- final-system/common/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/common/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -50,4 +50,8 @@
 
 <screen os="d"><userinput>patch -Np1 -i ../&glibc-localedef_segfault-patch;</userinput></screen>
+
+    <para os="p1">The following patch fixes an issue with iconv:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&glibc-iconv_fix-patch;</userinput></screen>
 
     <para os="s1">The following sed fixes a build issue with Glibc. This
Index: final-system/mips/glibc.xml
===================================================================
--- final-system/mips/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/mips/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -49,4 +49,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64-64/glibc.xml
===================================================================
--- final-system/mips64-64/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/mips64-64/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -53,4 +53,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64/glibc-64bit.xml
===================================================================
--- final-system/mips64/glibc-64bit.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/mips64/glibc-64bit.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -49,4 +49,12 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64/glibc-n32.xml
===================================================================
--- final-system/mips64/glibc-n32.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/mips64/glibc-n32.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -49,4 +49,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64/glibc.xml
===================================================================
--- final-system/mips64/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/mips64/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -54,4 +54,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/multilib/glibc-64bit.xml
===================================================================
--- final-system/multilib/glibc-64bit.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/multilib/glibc-64bit.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -33,4 +33,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/multilib/glibc.xml
===================================================================
--- final-system/multilib/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/multilib/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -38,4 +38,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/ppc64/glibc-64bit.xml
===================================================================
--- final-system/ppc64/glibc-64bit.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/ppc64/glibc-64bit.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -33,4 +33,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/ppc64/glibc.xml
===================================================================
--- final-system/ppc64/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/ppc64/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -38,4 +38,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/sparc64-64/glibc.xml
===================================================================
--- final-system/sparc64-64/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/sparc64-64/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -37,4 +37,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/sparc64/glibc-64bit.xml
===================================================================
--- final-system/sparc64/glibc-64bit.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/sparc64/glibc-64bit.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -33,4 +33,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/x86_64-64/glibc.xml
===================================================================
--- final-system/x86_64-64/glibc.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ final-system/x86_64-64/glibc.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -37,4 +37,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ introduction/common/changelog.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -41,5 +41,10 @@
       <itemizedlist>
         <listitem>
-          <para>[jciccone] - Updated to linux-2.6.17 and linux-headers-2.6.17-06192006.</para>
+          <para>[jciccone] - Added an iconv_fix patch to glibc which fixes an
+                issue that has shown up primarily in samba.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated to linux-2.6.17 and
+                linux-headers-2.6.17-06192006.</para>
         </listitem>
       </itemizedlist>
Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ materials/common/patches.xml	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -119,4 +119,13 @@
 
     <varlistentry>
+      <term>Glibc iconv Fix - <token>&glibc-iconv_fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;glibc/&glibc-iconv_fix-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-iconv_fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Glibc Disable linking with libgcc_eh.a - <token>&glibc-libgcc_eh-patch-size;</token>:</term>
       <listitem>
Index: patches.ent
===================================================================
--- patches.ent	(revision 2322c312f3b72b6dfe904eebc13e7967bc8ddeb9)
+++ patches.ent	(revision 4a0dbd7a73acc14e63d5fc68aa8052837a50f784)
@@ -52,4 +52,8 @@
 <!ENTITY gcc-specs-patch-md5 "a17be8ccfb978e73f382be5093dd8abd">
 <!ENTITY gcc-specs-patch-size "15 KB">
+
+<!ENTITY glibc-iconv_fix-patch "glibc-&glibc-version;-iconv_fix-1.patch">
+<!ENTITY glibc-iconv_fix-patch-md5 "9c8e681226ccf7a1f25c6467674f915e">
+<!ENTITY glibc-iconv_fix-patch-size "4 KB">
 
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
