diff --git a/src/evdev.c b/src/evdev.c
index e53e449..89ff6a5 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -678,9 +678,9 @@ EvdevAddKeyClass(DeviceIntPtr device)
         SetXkbOption(pInfo, "xkb_rules", &pEvdev->xkb_rules);
 	if (!pEvdev->xkb_rules)
 	    SetXkbOption(pInfo, "XkbRules", &pEvdev->xkb_rules);
+	/* sorry, no model change allowed for you */
+	xf86ReplaceStrOption(pInfo->options, "xkb_model", "evdev");
         SetXkbOption(pInfo, "xkb_model", &pEvdev->xkb_model);
-	if (!pEvdev->xkb_model)
-	    SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_model);
         SetXkbOption(pInfo, "xkb_layout", &pEvdev->xkb_layout);
 	if (!pEvdev->xkb_layout)
 	    SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout);