diff --git a/ChangeLog b/ChangeLog
index 864fec18b..643fca3e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  7 13:46:45 2006  Søren Sandmann  <sandmann@redhat.com>
+
+	* composite/compext.c (ProcCompositeReleaseOverlayWindow): Use
+	FreeResource instead of deleteCompOverlayClient()
+
 2006-04-07  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/common/xisb.c:
diff --git a/composite/compext.c b/composite/compext.c
index cc9b665f7..a7ad4e2fd 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -501,7 +501,8 @@ ProcCompositeReleaseOverlayWindow (ClientPtr client)
 	return BadMatch;
     }
 
-    deleteCompOverlayClient(pOc, pOc->pScreen);
+    /* The delete function will free the client structure */
+    FreeResource (pOc->resource, 0);
 
     cs = GetCompScreen(pScreen);
     if (cs->pOverlayClients == NULL) {