diff --git a/ChangeLog b/ChangeLog
index 42230213c..22ff0eb22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-25  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-behaviour.h:
+	* clutter/clutter-behaviour.c: Rename clutter_behaviour_clear()
+	to clutter_behaviour_remove_all() to avoid method clashes in
+	bindings.
+
 2007-07-25  Tomas Frydrych  <tf@openedhand.com>
 
 	* tests/test-rotate.c:
diff --git a/clutter/clutter-behaviour.c b/clutter/clutter-behaviour.c
index bba9aefea..c888ea56d 100644
--- a/clutter/clutter-behaviour.c
+++ b/clutter/clutter-behaviour.c
@@ -176,7 +176,7 @@ clutter_behaviour_dispose (GObject *gobject)
   ClutterBehaviour *self = CLUTTER_BEHAVIOUR (gobject);
 
   clutter_behaviour_set_alpha (self, NULL);
-  clutter_behaviour_clear (self);
+  clutter_behaviour_remove_all (self);
 
   G_OBJECT_CLASS (clutter_behaviour_parent_class)->dispose (gobject);
 }
@@ -599,7 +599,7 @@ clutter_behaviour_get_actors (ClutterBehaviour *behave)
 }
 
 /**
- * clutter_behaviour_clear:
+ * clutter_behaviour_remove_all:
  * @behave: a #ClutterBehaviour
  *
  * Removes every actor from the list that @behave holds.
@@ -607,7 +607,7 @@ clutter_behaviour_get_actors (ClutterBehaviour *behave)
  * Since: 0.4
  */
 void
-clutter_behaviour_clear (ClutterBehaviour *behave)
+clutter_behaviour_remove_all (ClutterBehaviour *behave)
 {
   ClutterBehaviourPrivate *priv;
   GSList *l;
diff --git a/clutter/clutter-behaviour.h b/clutter/clutter-behaviour.h
index ea84ca767..2498c917f 100644
--- a/clutter/clutter-behaviour.h
+++ b/clutter/clutter-behaviour.h
@@ -132,6 +132,7 @@ void          clutter_behaviour_apply          (ClutterBehaviour            *beh
                                                 ClutterActor                *actor);
 void          clutter_behaviour_remove         (ClutterBehaviour            *behave,
                                                 ClutterActor                *actor);
+void          clutter_behaviour_remove_all     (ClutterBehaviour            *behave);
 void          clutter_behaviour_actors_foreach (ClutterBehaviour            *behave,
                                                 ClutterBehaviourForeachFunc  func,
                                                 gpointer                     data);
@@ -144,7 +145,6 @@ void          clutter_behaviour_set_alpha      (ClutterBehaviour            *beh
                                                 ClutterAlpha                *alpha);
 gboolean      clutter_behaviour_is_applied     (ClutterBehaviour            *behave,
 						ClutterActor                *actor);
-void          clutter_behaviour_clear          (ClutterBehaviour            *behave);
 
 G_END_DECLS
 
diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index a0111559a..63ca0c4be 100644
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-25  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter-sections.txt: Rename clutter_behaviour_clear() to
+	clutter_behaviour_remove_all().
+
 2007-07-24  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter-sections.txt: Add new rotate behaviour methods.
diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt
index a54280ca2..907e47906 100644
--- a/doc/reference/clutter-sections.txt
+++ b/doc/reference/clutter-sections.txt
@@ -87,8 +87,8 @@ ClutterBehaviour
 ClutterBehaviourClass
 clutter_behaviour_apply
 clutter_behaviour_remove
+clutter_behaviour_remove_all
 clutter_behaviour_is_applied
-clutter_behaviour_clear
 ClutterBehaviourForeachFunc
 clutter_behaviour_actors_foreach
 clutter_behaviour_get_actors