diff --git a/xkeyboard-config-1.5-evdevkbds.patch b/xkeyboard-config-1.5-evdevkbds.patch
new file mode 100644
index 0000000..df93170
--- /dev/null
+++ b/xkeyboard-config-1.5-evdevkbds.patch
@@ -0,0 +1,31 @@
+From e8b234d2566c1a5dcb5d41706f14a66e426c7d30 Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu@gnome.org>
+Date: Sun, 1 Feb 2009 15:54:12 +0000
+Subject: [PATCH] introducing $evdevkbds
+
+---
+ ChangeLog             |    4 +++-
+ rules/base.lists.part |    1 +
+ rules/evdev.m_s.part  |    3 ++-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/rules/base.lists.part b/rules/base.lists.part
+index e1897b1..7cbd874 100644
+--- a/rules/base.lists.part
++++ b/rules/base.lists.part
+@@ -87,3 +87,4 @@
+               vn \
+               za
+ 
++! $evdevkbds = ibm_spacesaver
+diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part
+index fd6590d..516c976 100644
+--- a/rules/evdev.m_s.part
++++ b/rules/evdev.m_s.part
+@@ -1 +1,2 @@
+-  *     =       +inet(evdev)
++  $evdevkbds    =   +inet(evdev)+inet(%m)
++  *             =   +inet(evdev)
+-- 
+1.6.0.6
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 3c82c67..9adfa4e 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -16,6 +16,8 @@ Patch2: usinet.patch
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
+# Taken from upstream, remove with 1.6
+Patch6: xkeyboard-config-1.5-evdevkbds.patch
 
 BuildArch: noarch
 
@@ -97,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Feb 02 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5-2
+- xkeyboard-config-1.5-evdevkbds.patch: include model-specifics when using
+  evdev.
+
 * Mon Feb 02 2009 Peter Hutterer <peter.hutterer@redhat.com> 
 - purge obsolete patches.