diff --git a/ChangeLog b/ChangeLog
index 045373ae3..894f8238c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in:
+	* src/Makefile.am: Use the correct directory when
+	installing keybindings.  (#454055)
+
 2007-07-22  Thomas Thurman  <thomas@thurman.org.uk>
 
         * configure.in: post-release bump to 2.19.55.
diff --git a/configure.in b/configure.in
index ff9063040..13752c8d9 100644
--- a/configure.in
+++ b/configure.in
@@ -176,6 +176,13 @@ else
    AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
 fi
 
+if $PKG_CONFIG --exists gnome-keybindings; then
+  GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings)
+else
+  GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
+fi
+AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR)
+
 STARTUP_NOTIFICATION_VERSION=0.7
 AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 40b349edf..bfcbef554 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
-xmldir       = $(datadir)/control-center/keybindings
+xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)