diff --git a/ChangeLog b/ChangeLog
index 1fe28cbfa..d1d854e70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-14  Sergey V. Udaltsov <svu@gnome.org>
+
+	* configure.in, libkbdraw/Makefile.am, capplets/keyboard/Makefile.am:
+	fixing #313368
+
 2005-08-10  Sebastien Bacher  <seb128@debian.org>
 
 	* configure.in: update to 2.9.92
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 56ad9f2d2..1f54c8729 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -9,7 +9,7 @@ gnome_keyboard_properties_SOURCES = gnome-keyboard-properties.c \
                                     gnome-keyboard-properties-xkb.h
 gnome_keyboard_properties_LDADD =				\
 	../accessibility/keyboard/libaccessibility-keyboard.a 	\
-	$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
+	$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) $(PANGOXFT_LIBS) \
 	../../libgswitchit/libgswitchit.a \
 	../../libkbdraw/libkbdraw.a
 
diff --git a/configure.in b/configure.in
index 646078a2a..b9b2359ac 100644
--- a/configure.in
+++ b/configure.in
@@ -125,6 +125,8 @@ fi
 PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules)
 
 PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)
+
+PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.8)
 				
 dnl
 dnl Check for XRandR, needed for display capplet