diff --git a/ChangeLog b/ChangeLog
index e98e3daa6..d1083e49f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-05  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=125970
+	* configure.in : make x extension check more robust
+
 2003-10-28  Jody Goldberg <jody@gnome.org>
 
 	* configure.in : post release bump
diff --git a/NEWS b/NEWS
index 4b32d6c72..649e39e15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+gnome-control-center 2.5.1
+
+Jody:
+    http://bugzilla.gnome.org/show_bug.cgi?id=125899
+    http://bugzilla.gnome.org/show_bug.cgi?id=125970
+    * Fix the build and configure on older X servers.
+
+------------------------------------------------------------------------------
 gnome-control-center 2.5.0
 
 Jody:
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 8ee49feb1..62ee4610b 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-03  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=120842
+	* gnome-accessibility-keyboard-properties.c : older xservers require
+	  X11/Xlib.h too, its not sun specific.
+
 2003-10-28  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.5.0
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
index 789f0b946..6f996de7f 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
@@ -33,9 +33,7 @@
 #include "accessibility-keyboard.h"
 
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
-#  ifdef __sun
-#    include <X11/Xlib.h>
-#  endif
+#  include <X11/Xlib.h>
 #  include <X11/XKBlib.h>
 #  include <X11/extensions/XKBstr.h>
 #  include <gdk/gdk.h>
diff --git a/configure.in b/configure.in
index eeecb6517..0da3e6d3f 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,12 @@ x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
 dnl keyboard-properties-capplet
 savecppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc")
+AC_CHECK_HEADERS([X11/Xlib.h])
+AC_CHECK_HEADERS([X11/extensions/xf86misc.h], [XF86MISC_LIBS="-lXxf86misc"],[],
+[#if HAVE_X11_XLIB_H
+#include <X11/Xlib.h>
+#endif
+])
 AC_SUBST(XF86MISC_LIBS)
 AC_CHECK_HEADERS(X11/extensions/XKB.h)
 CPPFLAGS=$savecppflags