diff --git a/10-x11-keymap.fdi b/10-x11-keymap.fdi
index 7c1ecbb..c78f05b 100644
--- a/10-x11-keymap.fdi
+++ b/10-x11-keymap.fdi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
 <deviceinfo version="0.2">
     <device>
-	<match key="input.xkb.layout" exists="true">
+	<match key="info.capabilities" contains="input.keyboard">
 	    <append key="info.callouts.add" type="strlist">fedora-setup-keyboard</append>
 	</match>
     </device>
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 089756e..3536d7c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -531,6 +531,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-11
+- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
+  input.capabilities = keyboard (#484217)
+
 * Wed Feb 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.3-10
 - xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
   Xinerama is present (#473825)