Index: BOOK/final-system/alpha/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/alpha/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/alpha/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -30,5 +30,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp -R include/asm-alpha /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-alpha/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/mips/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/mips/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/mips/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -38,5 +38,6 @@
 <screen os="md"><userinput>patch -Np1 -i ../&linux-libc-headers-mips_atomic_fix-patch;</userinput></screen>
 
-<screen os="me"><userinput>cp -R include/asm-mips /usr/include/asm
+<screen os="me"><userinput>install -d /usr/include/asm
+cp -R include/asm-mips/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/ppc/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/ppc/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -30,5 +30,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp -R include/asm-ppc /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-ppc/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/sparc/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -34,5 +34,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cp -R include/asm-sparc /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-sparc/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/sparc64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64-64/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/sparc64-64/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -38,6 +38,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
-cp -R include/asm-sparc64 /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-sparc64/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/sparc64/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -43,8 +43,8 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
+<screen><userinput>install -d /usr/include/asm
 cp -R include/asm-sparc64 /usr/include/
 cp -R include/asm-sparc /usr/include/
-cp -R include/asm-sparc-biarch /usr/include/asm
+cp -R include/asm-sparc-biarch/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/x86/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/x86/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -44,5 +44,6 @@
     <para os="b">Install the header files:</para>
 
-<screen><userinput>cp -R include/asm-i386 /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-i386/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/x86_64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86_64-64/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/x86_64-64/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -30,6 +30,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
-cp -R include/asm-x86_64 /usr/include/asm
+<screen><userinput>install -d /usr/include/asm
+cp -R include/asm-x86_64/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/final-system/x86_64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86_64/linux-libc-headers.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/final-system/x86_64/linux-libc-headers.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -35,8 +35,8 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>install -d /usr/include
+<screen><userinput>install -d /usr/include/asm
 cp -R include/asm-i386 /usr/include/
 cp -R include/asm-x86_64 /usr/include/
-cp -R include/asm-x86_64-biarch /usr/include/asm
+cp -R include/asm-x86_64-biarch/* /usr/include/asm
 cp -R include/linux /usr/include
 cp -R include/mtd /usr/include
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision caab9dc85ef47978e87da6b54f6602c1db297dd8)
+++ BOOK/introduction/common/changelog.xml	(revision 2e144a03511fd4ab0e0b5d90bbb584cea7f1f7fb)
@@ -37,4 +37,14 @@
 -->
     <listitem>
+      <para>December 31, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Alter install of linux-libc-headers in final-system to
+	  be repeatable if rerun.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 30, 2005</para>
       <itemizedlist>
