Index: BOOK/final-system/alpha/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/alpha/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/alpha/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -32,7 +32,7 @@
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-alpha/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/mips/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/mips/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -40,7 +40,7 @@
 <screen os="me"><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-mips/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/ppc/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/ppc/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -32,7 +32,7 @@
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-ppc/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/sparc/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -36,6 +36,6 @@
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-sparc/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
 cp -arv include/scsi /usr/include/scsi</userinput></screen>
 
Index: BOOK/final-system/sparc64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64-64/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/sparc64-64/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -40,7 +40,7 @@
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-sparc64/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/sparc64/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -44,10 +44,10 @@
 
 <screen><userinput>install -dv /usr/include/{asm,asm-sparc64,asm-sparc,linux,mtd,scsi]
-cp -arv include/asm-sparc64 /usr/include/asm-sparc64
-cp -arv include/asm-sparc /usr/include/asm-sparc
+cp -arv include/asm-sparc64/* /usr/include/asm-sparc64
+cp -arv include/asm-sparc/* /usr/include/asm-sparc
 cp -arv include/asm-sparc-biarch/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/x86/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -46,7 +46,7 @@
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-i386/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <para os="c">Ensure that all the headers are owned by
Index: BOOK/final-system/x86_64-64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86_64-64/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/x86_64-64/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -32,7 +32,7 @@
 <screen><userinput>install -dv /usr/include/{asm,linux,mtd,scsi}
 cp -arv include/asm-x86_64/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/linux-libc-headers.xml
===================================================================
--- BOOK/final-system/x86_64/linux-libc-headers.xml	(revision 8aede6d96ce70c51be0021774b1d9186c598676e)
+++ BOOK/final-system/x86_64/linux-libc-headers.xml	(revision 2fcb68239ac2947d88c4a2afdfa7298a7174525a)
@@ -36,10 +36,10 @@
 
 <screen><userinput>install -dv /usr/include/{asm,asm-i386,asm-x86_64,linux,mtd,scsi}
-cp -arv include/asm-i386 /usr/include/asm-i386
-cp -arv include/asm-x86_64 /usr/include/asm-x86_64
+cp -arv include/asm-i386/* /usr/include/asm-i386
+cp -arv include/asm-x86_64/* /usr/include/asm-x86_64
 cp -arv include/asm-x86_64-biarch/* /usr/include/asm
-cp -arv include/linux /usr/include/linux
-cp -arv include/mtd /usr/include/mtd
-cp -arv include/scsi /usr/include/scsi</userinput></screen>
+cp -arv include/linux/* /usr/include/linux
+cp -arv include/mtd/* /usr/include/mtd
+cp -arv include/scsi/* /usr/include/scsi</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
