diff --git a/libX11-1.1.4-keysyms.patch b/libX11-1.1.4-keysyms.patch
new file mode 100644
index 0000000..29f15c2
--- /dev/null
+++ b/libX11-1.1.4-keysyms.patch
@@ -0,0 +1,30 @@
+diff -up libX11-1.1.4/src/XKeysymDB.orig libX11-1.1.4/src/XKeysymDB
+--- libX11-1.1.4/src/XKeysymDB.orig	2008-10-24 10:55:46.000000000 +1030
++++ libX11-1.1.4/src/XKeysymDB	2008-10-24 10:56:13.000000000 +1030
+@@ -331,6 +331,26 @@ XF86WebCam		:1008FF8F
+ XF86MailForward		:1008FF90
+ XF86Pictures		:1008FF91
+ XF86Music		:1008FF92
++XF86Battery		:1008FF93
++XF86Bluetooth		:1008FF94
++XF86WLAN		:1008FF95
++XF86UWB			:1008FF96
++XF86AudioForward	:1008FF97
++XF86AudioRepeat		:1008FF98
++XF86AudioRandomPlay	:1008FF99
++XF86Subtitle		:1008FF9A
++XF86AudioCycleTrack	:1008FF9B
++XF86CycleAngle		:1008FF9C
++XF86FrameBack		:1008FF9D
++XF86FrameForward	:1008FF9E
++XF86Time		:1008FF9F
++XF86Select		:1008FFA0
++XF86View		:1008FFA1
++XF86TopMenu		:1008FFA2
++XF86Red			:1008FFA3
++XF86Green		:1008FFA4
++XF86Yellow		:1008FFA5
++XF86Blue             	:1008FFA6
+ 
+ ! XFree86 special action keys
+ XF86_Switch_VT_1	:1008FE01
diff --git a/libX11.spec b/libX11.spec
index 72556f7..f58a730 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -16,6 +16,8 @@ Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
 Patch2: dont-forward-keycode-0.patch
 
 Patch3: libX11-1.1.4-xcb-xreply-leak.patch
+# Committed upstream, should be in next release
+Patch4: libX11-1.1.4-keysyms.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -57,6 +59,7 @@ X.Org X11 libX11 development package
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .xcb-xreply-leak
+%patch4 -p1 -b .keysyms
 
 %build
 %configure \
@@ -117,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Oct 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.1.4-5
+- libX11-1.1.4-keysysm.patch: add a bunch of keysyms for remote controls and
+  special keys.
+
 * Wed Sep 17 2008 Adam Jackson <ajax@redhat.com> 1.1.4-4
 - libX11-1.1.4-xcb-xreply-leak.patch: Fix the BadFont case.