--- maprules.c.orig	2006-07-11 22:06:35.000000000 +0400
+++ maprules.c	2009-01-14 23:01:14.866985482 +0300
@@ -891,6 +891,7 @@
     XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Append);
     XkbRF_ApplyPartialMatches(rules, names);
     XkbRF_CheckApplyRules(rules, &mdefs, names, XkbRF_Option);
+    XkbRF_ApplyPartialMatches(rules, names);
 
     if (names->keycodes)
 	names->keycodes= XkbRF_SubstituteVars(names->keycodes, &mdefs);