diff --git a/ChangeLog b/ChangeLog
index f1f7f129d..b2776fcf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-10  Neil Roberts  <neil@linux.intel.com>
+
+	Bug 1323 - ClutterBehaviorDepth conflicts with other behaviors
+
+	* clutter/clutter-behaviour-ellipse.c (actor_apply_knot_foreach):
+	Don't set the depth if there is no x or y tilt. That way it can
+	still be used in conjunction with ClutterBehaviourDepth. Thanks to
+	Tonny Tzeng.
+
 2008-12-08  Emmanuele Bassi  <ebassi@linux.intel.com>
 
 	* clutter/clutter-binding-pool.h: Fix the ActivateFunc
diff --git a/clutter/clutter-behaviour-ellipse.c b/clutter/clutter-behaviour-ellipse.c
index a24cd3c97..e7450ca5b 100644
--- a/clutter/clutter-behaviour-ellipse.c
+++ b/clutter/clutter-behaviour-ellipse.c
@@ -178,10 +178,13 @@ actor_apply_knot_foreach (ClutterBehaviour *behave,
                           ClutterActor     *actor,
                           gpointer          data)
 {
+  ClutterBehaviourEllipsePrivate *priv
+    = ((ClutterBehaviourEllipse *) behave)->priv;
   knot3d *knot = data;
 
   clutter_actor_set_position (actor, knot->x, knot->y);
-  clutter_actor_set_depth (actor, knot->z);
+  if (priv->angle_tilt_x != 0 || priv->angle_tilt_y != 0)
+    clutter_actor_set_depth (actor, knot->z);
 }
 
 static inline ClutterAngle