diff --git a/x0vncserver/Image.cxx b/x0vncserver/Image.cxx
index 475cee1..ef72378 100644
--- a/x0vncserver/Image.cxx
+++ b/x0vncserver/Image.cxx
@@ -361,7 +361,6 @@
     return;
 
   // FIXME: Check if the extension is available at run time.
-  // FIXME: Does XShmCreateReadDisplayBuf() require some cleanup?
   readDisplayBuf = XShmCreateReadDisplayBuf(dpy, NULL, shminfo, width, height);
 }
 
@@ -413,6 +412,9 @@
 {
   // DEBUG:
   // fprintf(stderr,"~IrixOverlayShmImage called\n");
+
+  if (readDisplayBuf != NULL)
+    XShmDestroyReadDisplayBuf(readDisplayBuf);
 }
 
 void IrixOverlayShmImage::get(Window wnd, int x, int y)