diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index c3d87fbe2..09e946c9a 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -893,7 +893,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
         rules = "base";
 
     /* Xkb default options. */
-    XkbInitRules(&set, rules, "pc105", "us", NULL, NULL);
+    XkbInitRules(&set, rules, XKB_DFLT_MODEL, XKB_DFLT_LAYOUT, NULL, NULL);
     XkbSetRulesDflts(&set);
     XkbFreeRMLVOSet(&set, FALSE);