diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 1f5f95d8b..4c67b6a6f 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Sergey V. Udaltsov <svu@gnome.org>
+
+	* libxklavier 1.12 compatibility
+
 2004-11-09  Mark McLoughlin  <mark@skynet.ie>
 
 	* Makefile.am: install .desktop file in $(datadir)/applications.
diff --git a/capplets/keyboard/gnome-keyboard-properties-xkblt.c b/capplets/keyboard/gnome-keyboard-properties-xkblt.c
index 4b457061f..1327db077 100644
--- a/capplets/keyboard/gnome-keyboard-properties-xkblt.c
+++ b/capplets/keyboard/gnome-keyboard-properties-xkblt.c
@@ -168,7 +168,7 @@ prepare_selected_layouts_tree (GladeXML * dialog)
   g_signal_connect_swapped (G_OBJECT (selection), "changed",
 			    G_CALLBACK
 			    (enable_disable_layouts_buttons), dialog);
-  maxSelectedLayouts = XklMultipleLayoutsSupported ()? XkbNumKbdGroups : 1;
+  maxSelectedLayouts = ( XklGetBackendFeatures() & XKLF_MULTIPLE_LAYOUTS_SUPPORTED ) ? XkbNumKbdGroups : 1;
 }
 
 void