diff --git a/ChangeLog b/ChangeLog
index f44909cdd..e7656eb99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-08  Ben Maurer  <bmaurer@ximian.com>
+
+	* glade/XML.custom: Do not look at inherited custom
+	attrs. Increases performance.
+
+	* glib/SignalAttribute.cs: Add AttributeUsage attr to increase
+	perf and compiler checking
+
 2005-10-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* glib/MainContext.cs: added a Depth property to p/invoke g_main_depth.
diff --git a/glade/XML.custom b/glade/XML.custom
index 44c72befe..879ceb7ea 100644
--- a/glade/XML.custom
+++ b/glade/XML.custom
@@ -270,7 +270,7 @@
 			static bool SignalFilter (System.Reflection.MemberInfo m, object filterCriteria) 
 			{
 				string signame = (filterCriteria as string);
-				object[] attrs = m.GetCustomAttributes (typeof (GLib.SignalAttribute), true);
+				object[] attrs = m.GetCustomAttributes (typeof (GLib.SignalAttribute), false);
 				if (attrs.Length > 0)
 				{
 					foreach (GLib.SignalAttribute a in attrs)
@@ -307,7 +307,7 @@
 			
 			foreach (System.Reflection.FieldInfo field in fields)
 			{
-				object[] attrs = field.GetCustomAttributes (typeof (WidgetAttribute), true);
+				object[] attrs = field.GetCustomAttributes (typeof (WidgetAttribute), false);
 				if (attrs == null || attrs.Length == 0)
 					continue;
 				// The widget to field binding must be 1:1, so only check
diff --git a/glib/SignalAttribute.cs b/glib/SignalAttribute.cs
index cd5b009f0..66adbbb3c 100644
--- a/glib/SignalAttribute.cs
+++ b/glib/SignalAttribute.cs
@@ -25,6 +25,7 @@ namespace GLib {
 	using System;
 
 	[Serializable]
+	[AttributeUsage (AttributeTargets.Event, Inherited=false)]
 	public sealed class SignalAttribute : Attribute 
 	{
 		private string cname;