diff --git a/ChangeLog b/ChangeLog
index b87704bd3..289f8d9ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-19  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* generator/Method.cs: Fixed bug where all ToString methods
+	was marked as override, this is only correct if the ToString
+	method does not have any parameters.
+
 2003-08-18  Aleksey Sanin  <aleksey@aleksey.com>
 
 	* generator/SignalHandler.cs : take refs on GObject sig parms.
diff --git a/generator/Method.cs b/generator/Method.cs
index 687cd56d3..3b6e30496 100644
--- a/generator/Method.cs
+++ b/generator/Method.cs
@@ -217,7 +217,7 @@ namespace GtkSharp.Generation {
 				sw.Write("static ");
 			sw.Write(safety);
 			Method dup = null;
-			if (Name == "ToString")
+			if (Name == "ToString" && Params == null)
 				sw.Write("override ");
 			else if (Name == "GetGType" && container_type is ObjectGen)
 				sw.Write("new ");