diff --git a/ChangeLog b/ChangeLog
index 5440437369..2d2447a390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): 
+	Fix problem where use_xshm was getting set wrong if
+	MIT_SHM wasn't found. (George Lebel)
+
 2003-08-04  Tor Lillqvist  <tml@iki.fi
 
 	* gdk/win32/gdkevents-win32.c (apply_filters): Fix braino:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5440437369..2d2447a390 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): 
+	Fix problem where use_xshm was getting set wrong if
+	MIT_SHM wasn't found. (George Lebel)
+
 2003-08-04  Tor Lillqvist  <tml@iki.fi
 
 	* gdk/win32/gdkevents-win32.c (apply_filters): Fix braino:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5440437369..2d2447a390 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): 
+	Fix problem where use_xshm was getting set wrong if
+	MIT_SHM wasn't found. (George Lebel)
+
 2003-08-04  Tor Lillqvist  <tml@iki.fi
 
 	* gdk/win32/gdkevents-win32.c (apply_filters): Fix braino:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5440437369..2d2447a390 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): 
+	Fix problem where use_xshm was getting set wrong if
+	MIT_SHM wasn't found. (George Lebel)
+
 2003-08-04  Tor Lillqvist  <tml@iki.fi
 
 	* gdk/win32/gdkevents-win32.c (apply_filters): Fix braino:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5440437369..2d2447a390 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): 
+	Fix problem where use_xshm was getting set wrong if
+	MIT_SHM wasn't found. (George Lebel)
+
 2003-08-04  Tor Lillqvist  <tml@iki.fi
 
 	* gdk/win32/gdkevents-win32.c (apply_filters): Fix braino:
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index fd50355da4..3a98d3b9b6 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -217,8 +217,8 @@ _gdk_windowing_image_init (GdkDisplay *display)
 					event_base, ShmNumberEvents);
 	}
       else
-	display_x11->use_xshm = TRUE;
 #endif /* USE_SHM */
+	display_x11->use_xshm = FALSE;
       }
 }