diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 59c2e702d..c77c3fc24 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,5 +1,9 @@
 2005-08-02  Matthias Clasen  <mclasen@redhat.com>
 
+	* gclosure.c (union ClosureInt): Mark the vint member as
+	volatile, which seems to be necessary to make atomic operations
+	work on s390.
+
 	* === Released 2.7.5 ===
 
 Mon Aug  1 23:00:42 2005  Tim Janik  <timj@imendio.com>
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index c28064453..7097075ed 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -41,7 +41,7 @@
 
 typedef union {
   GClosure closure;
-  gint     vint;
+  volatile gint vint;
 } ClosureInt;
 
 #define CHANGE_FIELD(_closure, _field, _OP, _value, _must_set, _SET_OLD, _SET_NEW)      \