diff --git a/ChangeLog b/ChangeLog
index d8652f5ec..83e6db46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-22  Sebastian Wilhelmi  <wilhelmi@google.com>
+
+	* glib/gthread.c (g_thread_init_glib): Run _g_atomic_thread_init
+	as the first of the full fledged initializers to allow the later
+	to potentially use atomic ints (which they currently do
+	not). (#342563, Peter Kjellerstedt)
+
 2006-05-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* tests/Makefile.am: 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d8652f5ec..83e6db46c 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2006-05-22  Sebastian Wilhelmi  <wilhelmi@google.com>
+
+	* glib/gthread.c (g_thread_init_glib): Run _g_atomic_thread_init
+	as the first of the full fledged initializers to allow the later
+	to potentially use atomic ints (which they currently do
+	not). (#342563, Peter Kjellerstedt)
+
 2006-05-16  Matthias Clasen  <mclasen@redhat.com>
 
 	* tests/Makefile.am: 
diff --git a/glib/gthread.c b/glib/gthread.c
index e7a8be7fd..ddee4f785 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -144,10 +144,10 @@ g_thread_init_glib (void)
   _g_messages_thread_init_nomessage ();
 
   /* we may run full-fledged initializers from here */
+  _g_atomic_thread_init ();
   _g_convert_thread_init ();
   _g_rand_thread_init ();
   _g_main_thread_init ();
-  _g_atomic_thread_init ();
   _g_utils_thread_init ();
 #ifdef G_OS_WIN32
   _g_win32_thread_init ();