diff --git a/ChangeLog b/ChangeLog
index a15d3160b..f219d359d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-06  Jeroen Zwartepoorte  <jeroen@xs4all.nl>
+
+	* generator/Method.cs: Don't use the "unsafe" modifier for methods which
+	are part of an interface [fixes #58059].
+
 2004-05-06  Mike Kestner  <mkestner@ximian.com>
 
 	* configure.in : bump version for cvs.
diff --git a/generator/Method.cs b/generator/Method.cs
index d551bdd6e..a81ca88be 100644
--- a/generator/Method.cs
+++ b/generator/Method.cs
@@ -159,7 +159,7 @@ namespace GtkSharp.Generation {
 			body = new MethodBody (parms, container_type.NS);
 			call = "(" + (IsShared ? "" : container_type.CallByName () + (parms != null ? ", " : "")) + body.GetCallString (is_set) + ")";
 
-			if (body.ThrowsException)
+			if (body.ThrowsException && !(container_type is InterfaceGen))
 				safety = "unsafe ";
 			else
 				safety = "";