diff --git a/ChangeLog b/ChangeLog
index ba8d0325c8..a566439ca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Default to linking against Xinerama again,
+	so that we can fallback to Xinerama when broken X drivers
+	make Xrandr useless. Sigh.
+
 2008-07-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/configure.in b/configure.in
index a3b9fe9f72..dc6b188f9f 100644
--- a/configure.in
+++ b/configure.in
@@ -228,7 +228,7 @@ AC_ARG_ENABLE(xkb,
 AC_ARG_ENABLE(xinerama,
               [AC_HELP_STRING([--enable-xinerama],
 	                      [support xinerama extension if available [default=yes]])],,
-              [enable_xinerama="no"])
+              [enable_xinerama="yes"])
 AC_ARG_ENABLE(rebuilds,
               [AC_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,