diff --git a/ChangeLog b/ChangeLog
index 2541415fe..45ad10d06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-06  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter/clutter-main.[ch]: Remove clutter_threads_enter()
+	and clutter_threads_leave(); both are no-ops and they just
+	confuse things. The thread-awareness in Clutter is planned
+	for 0.4.1/0.5.0.
+
+	* README:
+	* NEWS: Update.
+
 2007-08-06  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/clutter-box.[ch]: Implement margin, color and default
diff --git a/NEWS b/NEWS
index 94248e3ed..ad60ac906 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,13 @@ Clutter 0.4.0 (XX/08/2007)
 
    o Add basic tslib support to eglnative backend (for touchscreen events)
 
+   o New ClutterBox API: each box has now a colour and a margin (distance
+     between the inner-border and the children); plus, each packed child
+     has a padding. Margins and paddings are expressed in ClutterUnits,
+     to ease the transition to the device independent units. You can use
+     clutter_box_set_default_padding() if you want the same padding for
+     each child.
+
  * List of bug fixed
    o #390 - clutter_stage_get_actor_at_pos broken on 16bpp displays.
    o #398 - inconsistent type for return value of clutter_event_get_state
diff --git a/README b/README
index f7f263887..346230b9a 100644
--- a/README
+++ b/README
@@ -135,7 +135,14 @@ Release Notes for Clutter 0.4.0
 * clutter_actor_show_all does not recurse for groups at least (this is to
   match the original group_show_all behaviour)
 
-* FIXME
+* ClutterBox API has changed: clutter_box_pack_start() and
+  clutter_box_pack_end() have been removed in favour of the clutter_box_pack()
+  API.
+
+* Both clutter_threads_enter() and clutter_threads_leave() have been
+  removed from the API, as they just created confusion and the wrong
+  idea that Clutter is either thread-safe or thread-aware. Full
+  thread-awareness is arriving in the next revision (see bug #429).
 
 Release Notes for Clutter 0.3.1
 -------------------------------
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index be8c20811..64ac463dc 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -287,35 +287,6 @@ clutter_main (void)
   CLUTTER_MARK ();
 }
 
-/**
- * clutter_threads_enter:
- *
- * Locks the Clutter thread lock.
- */
-void
-clutter_threads_enter (void)
-{
-  ClutterMainContext *context = CLUTTER_CONTEXT ();
-  
-  if (context->gl_lock)
-    g_mutex_lock (context->gl_lock);
-}
-
-/**
- * clutter_threads_leave:
- *
- * Unlocks the Clutter thread lock.
- */
-void
-clutter_threads_leave (void)
-{
-  ClutterMainContext *context = CLUTTER_CONTEXT ();
-  
-  if (context->gl_lock)
-    g_mutex_unlock (context->gl_lock);
-}
-
-
 /**
  * clutter_get_debug_enabled:
  * 
diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h
index 112562196..24b38c2fc 100644
--- a/clutter/clutter-main.h
+++ b/clutter/clutter-main.h
@@ -63,9 +63,6 @@ void             clutter_redraw           (void);
 gboolean         clutter_get_debug_enabled (void);
 gboolean         clutter_get_show_fps      (void);
 
-void             clutter_threads_enter    (void);
-void             clutter_threads_leave    (void);
-
 void             clutter_base_init        (void);
 
 gulong           clutter_get_timestamp    (void);
diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h
index 3ef6ce0fe..159160491 100644
--- a/clutter/clutter-private.h
+++ b/clutter/clutter-private.h
@@ -51,7 +51,6 @@ struct _ClutterMainContext
   ClutterBackend  *backend;
   GQueue          *events_queue;
   PangoFT2FontMap *font_map;
-  GMutex          *gl_lock;
   guint            update_idle;
   guint            main_loop_level;
   GSList          *main_loops;
diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt
index 874298757..cf1b2bc2b 100644
--- a/doc/reference/clutter-sections.txt
+++ b/doc/reference/clutter-sections.txt
@@ -833,13 +833,11 @@ clutter_get_show_fps
 clutter_main
 clutter_main_quit
 clutter_main_level
-clutter_redraw
-clutter_threads_enter
-clutter_threads_leave
-clutter_base_init
 clutter_get_timestamp
 <SUBSECTION Private>
 clutter_init_error_quark
+clutter_base_init
+clutter_redraw
 </SECTION>
 
 <SECTION>