diff --git a/ChangeLog b/ChangeLog
index 28a1a4d7f..312eb3240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-19  Rachel Hestilow  <rachel@nullenvoid.com>
+
+	* sources/Gtk.metadata, api/gtk-api.xml: Rename
+	'Event' signals on Widget and TextTag to WidgetEvent
+	and TextTag event, respectively, to avoid
+	ambiguity with System.EventHandler/EventArgs.
+
 2003-09-18  Mike Kestner  <mkestner@ximian.com>
 
 	* configure.in : releasing 0.11
diff --git a/api/gtk-api.xml b/api/gtk-api.xml
index 1b77e6668..edd9dd007 100644
--- a/api/gtk-api.xml
+++ b/api/gtk-api.xml
@@ -6986,7 +6986,7 @@
       <property name="WrapMode" cname="wrap_mode" type="GtkWrapMode" readable="true" writeable="true"/>
       <property name="Tabs" cname="tabs" type="PangoTabArray" readable="true" writeable="true"/>
       <property name="Invisible" cname="invisible" type="gboolean" readable="true" writeable="true"/>
-      <signal name="Event" cname="event" when="LAST">
+      <signal name="TextEvent" cname="event" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkTextTag*" name="tag"/>
@@ -9248,7 +9248,7 @@
           <parameter type="GtkDirectionType" name="direction"/>
         </parameters>
       </signal>
-      <signal name="Event" cname="event" when="LAST">
+      <signal name="WidgetEvent" cname="event" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
           <parameter type="GtkWidget*" name="widget"/>
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
index 0b4970fa1..5c90374de 100644
--- a/sources/Gtk.metadata
+++ b/sources/Gtk.metadata
@@ -764,6 +764,28 @@
     </attribute>
   </data>
 </rule>
+<rule>
+  <class name="GtkWidget">
+    <signal>Event</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>WidgetEvent</value>
+    </attribute>
+  </data>
+</rule>
+<rule>
+  <class name="GtkTextTag">
+    <signal>Event</signal>
+  </class>
+  <data>
+    <attribute target="signal">
+      <name>name</name>
+      <value>TextEvent</value>
+    </attribute>
+  </data>
+</rule>
 <rule>
   <class name="GtkWidget">
     <method>IsFocus</method>