diff --git a/ChangeLog b/ChangeLog
index 27f57ae2a..6824c27ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-19  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-event.c (clutter_event_copy): Take an extra
+	reference on the related actor in ClutterEventCrossing that we
+	explicitly unref in clutter_event_free(). (#714, Neil Roberts)
+
 2008-01-18  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* tests/test-actors.c (input_cb): Fix the callback signature;
diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c
index f7157f394..d53e38e18 100644
--- a/clutter/clutter-event.c
+++ b/clutter/clutter-event.c
@@ -341,6 +341,19 @@ clutter_event_copy (ClutterEvent *event)
   new_event = clutter_event_new (CLUTTER_NOTHING);
   *new_event = *event;
 
+  /* deep copies or references must be added here */
+  switch (new_event->type)
+    {
+    case CLUTTER_ENTER:
+    case CLUTTER_LEAVE:
+      if (new_event->crossing.related)
+        g_object_ref (new_event->crossing.related);
+      break;
+
+    default:
+      break;
+    }
+
   return new_event;
 }
 
@@ -357,7 +370,8 @@ clutter_event_free (ClutterEvent *event)
     {
       if ((event->type == CLUTTER_LEAVE || event->type == CLUTTER_ENTER) &&
           event->crossing.related)
-         g_object_unref (event->crossing.related);
+        g_object_unref (event->crossing.related);
+
       g_slice_free (ClutterEvent, event);
     }
 }