diff --git a/xkeyboard-config/.footprint b/xkeyboard-config/.footprint
index 1ee09404..f16b0bbc 100644
--- a/xkeyboard-config/.footprint
+++ b/xkeyboard-config/.footprint
@@ -157,6 +157,7 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/al
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/altwin
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/am
+-rw-r--r--	root/root	usr/share/X11/xkb/symbols/apl
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/ara
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/at
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/az
@@ -190,12 +191,6 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/digital_vndr/
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/es
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/et
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/eurosign
-drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/extras/
--rw-r--r--	root/root	usr/share/X11/xkb/symbols/extras/apl
--rw-r--r--	root/root	usr/share/X11/xkb/symbols/extras/ir
--rw-r--r--	root/root	usr/share/X11/xkb/symbols/extras/rs
--rw-r--r--	root/root	usr/share/X11/xkb/symbols/extras/ru
--rw-r--r--	root/root	usr/share/X11/xkb/symbols/extras/us
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/fi
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/fo
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/fr
@@ -333,6 +328,7 @@ drwxr-xr-x	root/root	usr/share/X11/xkb/symbols/sun_vndr/
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/tj
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/tm
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/tr
+-rw-r--r--	root/root	usr/share/X11/xkb/symbols/tw
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/typo
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/tz
 -rw-r--r--	root/root	usr/share/X11/xkb/symbols/ua
diff --git a/xkeyboard-config/.md5sum b/xkeyboard-config/.md5sum
index e2f811f0..0706397f 100644
--- a/xkeyboard-config/.md5sum
+++ b/xkeyboard-config/.md5sum
@@ -1 +1 @@
-6ce65480445fb2d9c071ad1f002a7675  xkeyboard-config-2.1.tar.bz2
+1867472501d13594d5ca17e696cc09ca  xkeyboard-config-2.2.1.tar.bz2
diff --git a/xkeyboard-config/Pkgfile b/xkeyboard-config/Pkgfile
index 23a48909..ab35fc09 100644
--- a/xkeyboard-config/Pkgfile
+++ b/xkeyboard-config/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on: xorg-xkbcomp, intltool
 
 name=xkeyboard-config
-version=2.1
+version=2.2.1
 release=1
-source=(http://people.freedesktop.org/~svu/$name-$version.tar.bz2)
+source=(http://www.x.org/releases/individual/data/$name/$name-$version.tar.bz2)
 
 build() {
 	cd xkeyboard-config-$version