diff --git a/ChangeLog b/ChangeLog
index cabd1f8502..d4ff58b99a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
+	the size-changed signal correctly.  (#323848, Murray Cumming)
+
+	* gtk/gtkmarshalers.list: Add necessary marshaller.
+
 	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
 	fall thru to the wrong window types.  (#323843)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cabd1f8502..d4ff58b99a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
+	the size-changed signal correctly.  (#323848, Murray Cumming)
+
+	* gtk/gtkmarshalers.list: Add necessary marshaller.
+
 	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
 	fall thru to the wrong window types.  (#323843)
 
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index c18388f8e0..9d948c7c49 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -32,6 +32,7 @@ BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
 BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:INT
 BOOLEAN:INT,INT
 BOOLEAN:INT,INT,INT
 BOOLEAN:UINT
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 1ddb45adc3..07fe5ba5ea 100755
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -275,7 +275,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
 		  G_STRUCT_OFFSET (GtkStatusIconClass, size_changed),
 		  NULL,
 		  NULL,
-		  g_cclosure_marshal_VOID__INT,
+		  g_cclosure_marshal_BOOLEAN__INT,
 		  G_TYPE_NONE,
 		  1,
 		  G_TYPE_INT);