diff --git a/ChangeLog b/ChangeLog
index c5de6ea79..c749578ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-17  Sebastian Wilhelmi  <seppi@seppi.de>
+
+	* glib/gatomic.c: Fix memory barrier position in g_atomic_int_get
+	and g_atomic_pointer_get.
+
 2005-12-07  Tor Lillqvist  <tml@novell.com>
 
 	* glib-gettextize.in: Look up prefix at run-time on Win32,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c5de6ea79..c749578ec 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-17  Sebastian Wilhelmi  <seppi@seppi.de>
+
+	* glib/gatomic.c: Fix memory barrier position in g_atomic_int_get
+	and g_atomic_pointer_get.
+
 2005-12-07  Tor Lillqvist  <tml@novell.com>
 
 	* glib-gettextize.in: Look up prefix at run-time on Win32,
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c5de6ea79..c749578ec 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-12-17  Sebastian Wilhelmi  <seppi@seppi.de>
+
+	* glib/gatomic.c: Fix memory barrier position in g_atomic_int_get
+	and g_atomic_pointer_get.
+
 2005-12-07  Tor Lillqvist  <tml@novell.com>
 
 	* glib-gettextize.in: Look up prefix at run-time on Win32,
diff --git a/glib/gatomic.c b/glib/gatomic.c
index eb9bec352..dc55e5d9a 100644
--- a/glib/gatomic.c
+++ b/glib/gatomic.c
@@ -629,21 +629,15 @@ g_atomic_pointer_get (gpointer *atomic)
 gint
 g_atomic_int_get (gint *atomic)
 {
-  gint result = *atomic;
-
   G_ATOMIC_MEMORY_BARRIER;
-
-  return result;
+  return *atomic;
 }
 
 gpointer
 g_atomic_pointer_get (gpointer *atomic)
 {
-  gpointer result = *atomic;
-
   G_ATOMIC_MEMORY_BARRIER;
-
-  return result;
+  return *atomic;
 }   
 #endif /* DEFINE_WITH_MUTEXES || G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */