diff --git a/ChangeLog b/ChangeLog
index 6b4905a12..bfc9b8789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	* render/picture.h:
 	Bug #6325: Add support for x4a4 picture format.
 
+	* hw/xfree86/os-support/linux/lnx_KbdMap.c:
+	Bug #6472: Fix a static buffer overflow.  (David Woodhouse)
+
 2006-04-18  Donnie Berkholz  <spyderous@gentoo.org>
 
 	reviewed by: Alan Coopersmith
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 */