diff --git a/ChangeLog b/ChangeLog
index c84f2b9..d2addb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-26 00:24  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/x11/XWindowBuffer.m (-dealloc): Free the shared memory
+	pixmap (if one was allocated).
+
+	* Source/art/composite.m: When checking whether the overlap handling
+	should be used, compare windows, not gstates.
+
 2003-03-22  Willem Rein Oudshoorn  <woudshoo@xs4all.nl>
 
 	* Source/x11/XGServerWindow.m ([XGServer -orderwindow:::]): 
diff --git a/Source/x11/XWindowBuffer.m b/Source/x11/XWindowBuffer.m
index f5ebd75..7ecfa32 100644
--- a/Source/x11/XWindowBuffer.m
+++ b/Source/x11/XWindowBuffer.m
@@ -511,6 +511,13 @@ static int warn = 0;
 
   if (ximage)
     {
+      if (pixmap)
+	{
+	  XFreePixmap(display,pixmap);
+	  XSetWindowBackground(display,window->ident,None);
+	  pixmap=0;
+	}
+
       if (use_shm)
 	{
 	  XShmDetach(display, &shminfo);