Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/final-system/sparc-chapter.xml	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -55,5 +55,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
Index: OK/final-system/sparc/kbd.xml
===================================================================
--- BOOK/final-system/sparc/kbd.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kbd" role="wrap">
-  <?dbhtml filename="kbd.html"?>
-
-  <title>Kbd-&kbd-version;</title>
-
-  <indexterm zone="ch-system-kbd">
-    <primary sortas="a-Kbd">Kbd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kbd</title>
-
-    <para os="p1">The following patch prevents an error due to kbio.h header missing:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&kbd-kbio-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(id('contents-kbd'))"/>
-
-</sect1>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -55,5 +55,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -75,5 +75,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
Index: OK/final-system/sparc64/kbd.xml
===================================================================
--- BOOK/final-system/sparc64/kbd.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kbd" role="wrap">
-  <?dbhtml filename="kbd.html"?>
-
-  <title>Kbd-&kbd-version;</title>
-
-  <indexterm zone="ch-system-kbd">
-    <primary sortas="a-Kbd">Kbd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kbd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/kbd.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/kbd.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/kbd.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/kbd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(id('contents-kbd'))"/>
-
-</sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/introduction/common/changelog.xml	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -40,4 +40,7 @@
       <para>August 02, 2010</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Kbd to 1.15.2.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated IPUtils to s20100418.</para>
Index: BOOK/materials/sparc/patches.xml
===================================================================
--- BOOK/materials/sparc/patches.xml	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/materials/sparc/patches.xml	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -26,13 +26,4 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="kbd-kbio-patch">
-      <term>KBD kbio Patch - <token>&kbd-kbio-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&kbd-kbio-patch;"/></para>
-        <para>MD5 sum: <literal>&kbd-kbio-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="silo-fixes-patch">
       <term>Silo Fixes Patch - <token>&silo-fixes-patch-size;</token>:</term>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/packages.ent	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -234,8 +234,8 @@
 <!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
 
-<!ENTITY kbd-version "1.15">
-<!ENTITY kbd-size "1,288 KB">
+<!ENTITY kbd-version "1.15.2">
+<!ENTITY kbd-size "1,524 KB">
 <!ENTITY kbd-url "ftp://devel.altlinux.org/legion/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "ba3fd20e6c79e58422c3cc6b28718939">
+<!ENTITY kbd-md5 "77d0b51454522bc6c170bbdc6e31202a">
 <!ENTITY kbd-home " ">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ BOOK/patches.ent	(revision 06bf59e606e36ca20daf4e05538db649d56deb7a)
@@ -167,8 +167,4 @@
 <!ENTITY elftoaout-fixes-patch-size "6 KB">
 
-<!ENTITY kbd-kbio-patch "kbd-&kbd-version;-sparc_kbio-1.patch">
-<!ENTITY kbd-kbio-patch-md5 "01e9b5ca65b76d8ad79701a8ed5bdece">
-<!ENTITY kbd-kbio-patch-size "2 KB">
-
 <!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-1.patch">
 <!ENTITY silo-fixes-patch-md5 "03e8897c5d33d0e6ee81e8e8aeeb772f">
Index: tches/kbd-1.15-sparc_kbio-1.patch
===================================================================
--- patches/kbd-1.15-sparc_kbio-1.patch	(revision 8867e46f72779f614d2e2dd43bc57400297cf6a1)
+++ 	(revision )
@@ -1,106 +1,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 2009-02-05
-Initial Package Version: 1.15
-Origin: Fedora
-Upstream Status: Unknown
-Description: Sparc Linux Headers doesn't have asm/kbio.h anymore
-
-diff -Naur kbd-1.15.orig/man/man8/kbdrate.8 kbd-1.15/man/man8/kbdrate.8
---- kbd-1.15.orig/man/man8/kbdrate.8	2008-03-13 09:46:23.000000000 -0700
-+++ kbd-1.15/man/man8/kbdrate.8	2009-02-05 20:18:28.014455370 -0800
-@@ -22,7 +22,7 @@
- without any options will reset the repeat rate to 10.9 characters per second (cps)
- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
--to 5 cps and the delay to 200 ms.
-+to 20 cps and the delay to 200 ms.
- 
- .SH OPTIONS
- .TP
-@@ -69,3 +69,5 @@
- .I /etc/rc.local
- .br
- .I /dev/port
-+.br
-+.I /dev/kbd
-diff -Naur kbd-1.15.orig/src/kbdrate.c kbd-1.15/src/kbdrate.c
---- kbd-1.15.orig/src/kbdrate.c	2008-03-14 01:03:43.000000000 -0700
-+++ kbd-1.15/src/kbdrate.c	2009-02-05 20:18:28.014455370 -0800
-@@ -77,7 +77,6 @@
- 
- #ifdef __sparc__
- #include <asm/param.h>
--#include <asm/kbio.h>
- #endif
- 
- #ifndef KDKBDREP
-@@ -109,11 +108,15 @@
- 
- static int
- KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
-+#if defined(KDKBDREP) && !defined(__sparc__)
- 	/*
- 	 * This ioctl is defined in <linux/kd.h> but is not
- 	 * implemented anywhere - must be in some m68k patches.
-+         * We cannot blindly try unimplemented ioctls on sparc64 -
-+         * the 32<->64bit transition layer does not like it.
- 	 * Since 2.4.9 also on i386.
--	 */
-+         */
-+
- 	struct my_kbd_repeat kbdrep_s;
- 
- 	/* don't change, just test */
-@@ -177,6 +180,9 @@
- 			rate, kbdrep_s.delay );
- 
- 	return 1;			/* success! */
-+#else /* no KDKBDREP or __sparc__ */
-+        return 0;
-+#endif /* KDKBDREP */
- }
- 
- static int
-@@ -221,7 +227,7 @@
- int
- main( int argc, char **argv ) {
- #ifdef __sparc__
--	double      rate = 5.0;      /* Default rate */
-+        double      rate = 20.0;      /* Default rate */
- 	int         delay = 200;     /* Default delay */
- #else
- 	double      rate = 10.9;     /* Default rate */
-@@ -272,7 +278,9 @@
- 
- 
- 	/* The ioport way */
-+        /* The ioport way - will crash on sparc */
- 
-+#ifndef __sparc__
- 	for (i = 0; i < RATE_COUNT; i++)
- 		if (rate * 10 >= valid_rates[i]) {
- 			value &= 0x60;
-@@ -335,5 +343,7 @@
- 			valid_rates[value & 0x1f] / 10.0,
- 			valid_delays[ (value & 0x60) >> 5 ] );
- 
-+#endif
-+
- 	return 0;
- }
-diff -Naur kbd-1.15.orig/src/setleds.c kbd-1.15/src/setleds.c
---- kbd-1.15.orig/src/setleds.c	2008-03-14 01:03:43.000000000 -0700
-+++ kbd-1.15/src/setleds.c	2009-02-05 20:18:28.014455370 -0800
-@@ -14,10 +14,6 @@
- #include "nls.h"
- #include "version.h"
- 
--#ifdef __sparc__
--#include <asm/kbio.h>
--#endif
--
- static void
- usage(void)
- {
-
-
