diff --git a/ChangeLog b/ChangeLog
index 4e8da7ac4..701db906f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-15  Sebastian Wilhelmi  <seppi@seppi.de>
+
+	* glib/gthreadpool.c: Fix deadlock when signalling the thread
+	which freed a thread pool (#331110, Chris Wilson).
+
 2006-01-30  David Schleef  <ds@schleef.org>
 
 	* glib/grand.c: Update URL
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4e8da7ac4..701db906f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-15  Sebastian Wilhelmi  <seppi@seppi.de>
+
+	* glib/gthreadpool.c: Fix deadlock when signalling the thread
+	which freed a thread pool (#331110, Chris Wilson).
+
 2006-01-30  David Schleef  <ds@schleef.org>
 
 	* glib/grand.c: Update URL
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4e8da7ac4..701db906f 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2006-02-15  Sebastian Wilhelmi  <seppi@seppi.de>
+
+	* glib/gthreadpool.c: Fix deadlock when signalling the thread
+	which freed a thread pool (#331110, Chris Wilson).
+
 2006-01-30  David Schleef  <ds@schleef.org>
 
 	* glib/grand.c: Update URL
diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c
index d39974e13..03ee7c25b 100644
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -120,7 +120,9 @@ g_thread_pool_thread_proxy (gpointer data)
 
       if (!g_thread_should_run (pool, len))
 	{
+	  g_mutex_lock (inform_mutex);	  
 	  g_cond_broadcast (inform_cond);
+	  g_mutex_unlock (inform_mutex);	  
 	  goto_global_pool = TRUE;
 	}
       else if (len > 0)
@@ -531,7 +533,7 @@ g_thread_pool_free (GThreadPool     *pool,
 
   g_return_if_fail (real);
   g_return_if_fail (real->running);
-  /* It there's no thread allowed here, there is not much sense in
+  /* If there's no thread allowed here, there is not much sense in
    * not stopping this pool immediately, when it's not empty */
   g_return_if_fail (immediate || real->max_threads != 0 || 
 		    g_async_queue_length (real->queue) == 0);
@@ -544,15 +546,21 @@ g_thread_pool_free (GThreadPool     *pool,
 
   if (wait)
     {
-      g_mutex_lock (inform_mutex);
       while (g_async_queue_length_unlocked (real->queue) != -real->num_threads &&
 	     !(immediate && real->num_threads == 0))
 	{
+	  /* This locking is a bit delicate to avoid the broadcast of
+	   * inform_cond to overtake the wait for it.  Therefore the
+	   * inform_mutex is locked before the queue is unlocked. To
+	   * avoid deadlocks however, the queue _must_ always be
+	   * locked before locking the inform_mutex, if both are to be
+	   * locked at the same time. */
+	  g_mutex_lock (inform_mutex);
 	  g_async_queue_unlock (real->queue); 
 	  g_cond_wait (inform_cond, inform_mutex); 
+	  g_mutex_unlock (inform_mutex); 
 	  g_async_queue_lock (real->queue); 
 	}
-      g_mutex_unlock (inform_mutex); 
     }
 
   if (immediate ||