diff --git a/ChangeLog b/ChangeLog
index 074ac383c..97b4a429c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-27  Mike Kestner  <mkestner@novell.com>
+
+	* glib/Signal.cs: multiple dispose guarding for closures.
+
 2008-08-27  Mike Kestner  <mkestner@novell.com>
 
 	* generator/ManagedCallString.cs: fixes for data parameter hiding
diff --git a/glib/Signal.cs b/glib/Signal.cs
index 99cd32b8e..17a398b7b 100644
--- a/glib/Signal.cs
+++ b/glib/Signal.cs
@@ -160,7 +160,7 @@ namespace GLib {
 				if (tref.Target != null)
 					tref.Target.BeforeSignals.Remove (name);
 				before_closure = null;
-			} else {
+			} else if (o == after_closure) {
 				after_closure.Disposed -= new EventHandler (ClosureDisposedHandler);
 				after_closure.Invoked -= new ClosureInvokedHandler (ClosureInvokedCB);
 				if (tref.Target != null)