diff --git a/ChangeLog b/ChangeLog
index 0d2f13373..4c2d9cacc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-02  Neil Roberts  <neil@o-hand.com>
+
+	* clutter/cogl/gl/cogl-context.c (cogl_destroy_context): Fix
+	cut-and-paste error where the wrong arrays were being freed.
+
 2008-06-01  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	Merge from clutter-0-6:
diff --git a/clutter/cogl/gl/cogl-context.c b/clutter/cogl/gl/cogl-context.c
index ce5b792c9..d3832178f 100644
--- a/clutter/cogl/gl/cogl-context.c
+++ b/clutter/cogl/gl/cogl-context.c
@@ -111,9 +111,9 @@ cogl_destroy_context ()
   if (_context->texture_handles)
     g_array_free (_context->texture_handles, TRUE);
   if (_context->fbo_handles)
-    g_array_free (_context->texture_handles, TRUE);
+    g_array_free (_context->fbo_handles, TRUE);
   if (_context->shader_handles)
-    g_array_free (_context->texture_handles, TRUE);
+    g_array_free (_context->shader_handles, TRUE);
   if (_context->program_handles)
     g_array_free (_context->program_handles, TRUE);