diff --git a/ChangeLog b/ChangeLog
index 1328fd9d2..5bf6e0933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-22  Benjamin Herrenschmidt  <benh@kernel.crashing.org> 
+
+	* hw/xfree86/os-support/linux/lnx_KbdMap.c:
+	When reading the kernel keyboard mapping (readKernelMapping in
+	os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global array
+	'map', scribbling on other random static variables elsewhere. This
+	is fixed by changing the size of at2lnx. (David Woodhouse). Bug #5169
+
 2006-04-19  Keith Packard  <keithp@keithp.com>
 
 	* fb/fbcompose.c: (fbFetch_x4a4), (fetchProcForPicture),
diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c
index 3a5a57b8c..a2a2e224d 100644
--- a/hw/xfree86/os-support/linux/lnx_KbdMap.c
+++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c
@@ -180,7 +180,7 @@ static KeySym linux_to_x[256] = {
 /*
  * Maps the AT keycodes to Linux keycodes
  */
-static unsigned char at2lnx[NUM_KEYCODES] =
+static unsigned char at2lnx[] =
 {
 	0x01,	/* KEY_Escape */	0x02,	/* KEY_1 */
 	0x03,	/* KEY_2 */		0x04,	/* KEY_3 */