diff --git a/CHANGES b/CHANGES
index 846183d6c7..26cda06a41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@
 	lsof, ltp-testsuite, lvm2, m4, memtester, mii-diag, mplayer,
 	mrouted, netplug, openssh, openssl, openvpn, pango, qt, rsync,
 	sdl_gfx, sdl_sound, sysklogd, sysvinit, udev, usbutils,
-	xlib_libX11, xz, zlib
+	xkeyboard-config, xlib_libX11, xz, zlib
 
 	New packages: dhrystone, fbgrab, lsuio, rsh-redone, whetstone,
 	xl2tp
@@ -23,6 +23,7 @@
 	#1651: Build fail caused by ccache in module-init-tools
 	#1735: [PATCH] mplayer: convert to autotools infrastructure
 	#2905: Qt: Speed up compilation, if gui-module isn't selected
+	#2965: Broken linkage to xkbcomp (blocking X server startup)
 	#2983: xlib_libX11 build failed
 
 2010.11, Released November 30th, 2010:
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index b9f1d6215a..f5ad44d7fb 100644
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -3,9 +3,9 @@
 # xkeyboard-config
 #
 #############################################################
-XKEYBOARD_CONFIG_VERSION = 1.8
+XKEYBOARD_CONFIG_VERSION = 2.0
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
-XKEYBOARD_CONFIG_SITE = http://xlibs.freedesktop.org/xkbdesc
+XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config/
 XKEYBOARD_CONFIG_AUTORECONF = NO
 XKEYBOARD_CONFIG_INSTALL_STAGING = NO
 XKEYBOARD_CONFIG_INSTALL_TARGET = YES