diff --git a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
index b0ae6e20fa..7570607b4f 100644
--- a/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
+++ b/legacy/evas/src/modules/engines/software_16_x11/evas_engine.c
@@ -307,8 +307,16 @@ eng_output_idle_flush(void *data)
    Render_Engine *re;
 
    re = (Render_Engine *)data;
-   /* FIXME: clean up any resources kept around between renders in case
-    * we are animating a lot and want high fps */
+   if (re->shbuf)
+     {
+	evas_software_x11_x_output_buffer_free(re->shbuf, 0);
+	re->shbuf = NULL;
+     }
+   if (re->clip_rects)
+     {
+	XDestroyRegion(re->clip_rects);
+	re->clip_rects = NULL;
+     }
 }