diff --git a/ChangeLog b/ChangeLog
index 763d27592..e867c726b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-30  Matthias Clasen  <mclasen@redhat.com>
+
+	Backport from trunk:
+
+	Bug 536158 – also bump GHashTable version when a node is removed via
+	g_hash_table_iter_remove()/g_hash_table_iter_steal()
+
+	* glib/ghash.c (iter_remove_or_steal): Bump the hash table
+	version. Patch by Jean-Yves Lefort
+
 2008-06-30  Matthias Clasen  <mclasen@redhat.com>
 
 	Backport from trunk:
diff --git a/glib/ghash.c b/glib/ghash.c
index af81f5acc..e00b4c4cc 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -530,6 +530,11 @@ iter_remove_or_steal (RealIter *ri, gboolean notify)
   g_slice_free (GHashNode, node);
 
   ri->hash_table->nnodes--;
+
+#ifndef G_DISABLE_ASSERT
+  ri->version++;
+  ri->hash_table->version++;
+#endif
 }
 
 /**