diff --git a/ChangeLog b/ChangeLog
index 37295d5bd..13e200e6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-14  Cody Russell  <bratsche@gnome.org>
+
+	* gobject/gsignal.c: g_type_default_interface_ref() was not
+	ensuring working g_signal_list_ids.  Added checks for
+	!G_TYPE_IS_INTERFACE (itype).
+	(#465625, by some guy who calls himself Yeti)
+
 Tue Aug 14 02:06:10 2007  Tim Janik  <timj@imendio.com>
 
 	* glib/gthread.c (g_once_init_enter_impl): prevent race covered
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index c65565ae2..8ce1b6c6a 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1058,10 +1058,10 @@ g_signal_list_ids (GType  itype,
       if (!g_type_name (itype))
 	g_warning (G_STRLOC ": unable to list signals for invalid type id `%lu'",
 		   itype);
-      else if (!G_TYPE_IS_INSTANTIATABLE (itype))
+      else if (!G_TYPE_IS_INSTANTIATABLE (itype) && !G_TYPE_IS_INTERFACE (itype))
 	g_warning (G_STRLOC ": unable to list signals of non instantiatable type `%s'",
 		   g_type_name (itype));
-      else if (!g_type_class_peek (itype))
+      else if (!g_type_class_peek (itype) && !G_TYPE_IS_INTERFACE (itype))
 	g_warning (G_STRLOC ": unable to list signals of unloaded type `%s'",
 		   g_type_name (itype));
     }