--- gnome-settings-daemon-2.23.2/plugins/keyboard/gsd-keyboard-xkb.c.ignore-layout-if-using-evdev	2008-05-14 00:42:44.000000000 -0400
+++ gnome-settings-daemon-2.23.2/plugins/keyboard/gsd-keyboard-xkb.c	2008-05-14 19:25:17.000000000 -0400
@@ -181,6 +181,13 @@ apply_xkb_settings (void)
                 gdm_keyboard_layout = NULL;
         }
 
+        /* Ignore model if using evdev, since evdev needs its own model
+         */
+        if (strcmp (initial_sys_kbd_config.model, "evdev") == 0) {
+                g_free (current_kbd_config.model);
+                current_kbd_config.model = g_strdup ("evdev");
+        }
+
         /* Activate - only if different! */
         if (!gkbd_keyboard_config_equals
             (&current_kbd_config, &current_sys_kbd_config)) {