diff --git a/ChangeLog b/ChangeLog
index 30c0c237a6..8278b38347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkwindow-x11.c (gdk_window_beep): Only use XKB
+	for beeping if we are using XKB.  
+
 2006-08-29  Matthias Clasen  <mclasen@redhat.com>
 
 	* gdk/gdkwindow.h: 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 665793ad51..a417bbc397 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -6329,13 +6329,19 @@ gdk_window_configure_finished (GdkWindow *window)
 void
 gdk_window_beep (GdkWindow *window)
 {
+  GdkDisplay *display;
+
+  display = GDK_WINDOW_DISPLAY (window);
+
 #ifdef HAVE_XKB
-  XkbBell (GDK_WINDOW_XDISPLAY (window),
-           GDK_WINDOW_XID (window),
-           0,
-           None);
+  if (GDK_DISPLAY_X11 (display)->use_xkb)
+    XkbBell (GDK_DISPLAY_XDISPLAY (display),
+	     GDK_WINDOW_XID (window),
+	     0,
+	     None);
+  else
 #else
-  gdk_display_beep (GDK_WINDOW_DISPLAY (window));
+    gdk_display_beep (display);
 #endif
 }