Index: plugins/keyboard/gsd-keyboard-manager.c
===================================================================
--- plugins/keyboard/gsd-keyboard-manager.c	(revision 280)
+++ plugins/keyboard/gsd-keyboard-manager.c	(working copy)
@@ -336,7 +336,8 @@ apply_settings (GConfClient        *clie
                 XAutoRepeatOn (GDK_DISPLAY ());
                 /* Use XKB in preference */
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
-                rate_set = xkb_set_keyboard_autorepeat_rate (delay, rate);
+                if (manager->priv->have_xkb)
+                        rate_set = xkb_set_keyboard_autorepeat_rate (delay, rate);
 #endif
 #ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
                 if (!rate_set)
