diff --git a/general.ent b/general.ent
index 2c7fbc4e7c..f9aef9ec08 100644
--- a/general.ent
+++ b/general.ent
@@ -621,7 +621,7 @@ $Date$
 <!ENTITY libxcb-version               "1.8.1">
 <!ENTITY xbitmaps-version             "1.1.1">
 <!ENTITY xcursor-themes-version       "1.0.3">
-<!ENTITY xkeyboard-config-version     "2.0">
+<!ENTITY xkeyboard-config-version     "2.5.1">
 <!ENTITY mesalib-version              "8.0.3">
 <!ENTITY xcb-util-version             "0.3.8">
 <!ENTITY printproto-version           "1.0.5">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 542696c608..131c572c08 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -63,6 +63,9 @@
         <listitem>
           <para>[dj] - Updated to libxcb-1.8.1.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Updated to xkeyboard-config-2.5.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/x/installing/xkeyboard-config.xml b/x/installing/xkeyboard-config.xml
index 14afdc935b..1e810fa689 100644
--- a/x/installing/xkeyboard-config.xml
+++ b/x/installing/xkeyboard-config.xml
@@ -9,9 +9,9 @@
   <!ENTITY xkeyboard-config-download-ftp  "ftp://ftp.x.org/pub/current/src/extras/xkeyboard-config-&xkeyboard-config-version;.tar.bz2">
   -->
   <!ENTITY xkeyboard-config-download-ftp  " ">
-  <!ENTITY xkeyboard-config-md5sum        "bb8a98ee61cdc4bd835fdfd2b5cee3e6">
-  <!ENTITY xkeyboard-config-size          "636 KB">
-  <!ENTITY xkeyboard-config-buildsize     "11.5 MB">
+  <!ENTITY xkeyboard-config-md5sum        "29cbf3980bbe94c3ffc9c233ea638059">
+  <!ENTITY xkeyboard-config-size          "814 KB">
+  <!ENTITY xkeyboard-config-buildsize     "14.8 MB">
   <!ENTITY xkeyboard-config-time          "less than 0.1 SBU">
 ]>