diff --git a/ChangeLog b/ChangeLog
index 11c6f116f..090d9c53e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-14  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-container.[ch]:
+	* clutter/clutter-actor.c:
+	* clutter/clutter-group.c: Rename clutter_container_raise() to
+	clutter_container_raise_child(), and clutter_container_lower()
+	to clutter_container_lower_child() to avoid clashing with
+	ClutterActor raise() and lower() respectively.
+
 2007-08-13  Matthew Allum  <mallum@openedhand.com>
 
 	* clutter/clutter-actor.c:
diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 6dda6af32..bc841e97d 100644
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-14  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter-sections.txt: Rename raise() and lower() methods of
+	ClutterContainer.
+
 2007-08-13  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter-sections.txt: Add the new ClutterContainer methods.