diff --git a/ChangeLog b/ChangeLog
index 07b3af5d1..5236980d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* generator/SignalHandler.cs: the generated Dispose method now calls
+	base.Dispose and always disconnects the handler. Thanks to
+	Petr Danecek <danecek@ucl.cas.cz>.
+
 2003-02-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* api/gdk-api.xml:
diff --git a/generator/SignalHandler.cs b/generator/SignalHandler.cs
index 3488c2386..3c91ae302 100644
--- a/generator/SignalHandler.cs
+++ b/generator/SignalHandler.cs
@@ -187,10 +187,11 @@ namespace GtkSharp.Generation {
 			sw.WriteLine("\t\tprotected override void Dispose (bool disposing)");
 			sw.WriteLine("\t\t{");
 			sw.WriteLine("\t\t\t_Instances.Remove(_key);");
-			sw.WriteLine("\t\t\tif(_Instances.Count == 0) {");
-			sw.WriteLine("\t\t\t\tg_signal_handler_disconnect (_raw, _HandlerID);");
+			sw.WriteLine("\t\t\tif(_Instances.Count == 0)");
 			sw.WriteLine("\t\t\t\t_Delegate = null;");
-			sw.WriteLine("\t\t\t}");
+			sw.WriteLine();
+			sw.WriteLine("\t\t\tg_signal_handler_disconnect (_raw, _HandlerID);");
+			sw.WriteLine("\t\t\tbase.Dispose (disposing);");
 			sw.WriteLine("\t\t}");
 			sw.WriteLine("\t}");
 			sw.WriteLine("}");