diff --git a/ChangeLog b/ChangeLog
index 226cd18b89..83aa8941f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-25  Murray Cumming  <murrayc@murrayc.com>
+
+	* gtk/gtkstatusicon.c (gtk_status_icon_class_init):
+	Documented the activate and popup-menu signals as being for use 
+	by applications and language bindings, though they are G_SIGNAL_ACTION, 
+	as stated in bug #361561.
+
 2008-07-24  Sebastien Bacher  <seb128@ubuntu.com>
 
 	* modules/printbackends/cups/gtkprintbackendcups.c:
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 9a9be083a5..52b8d85662 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -294,6 +294,9 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * Gets emitted when the user activates the status icon. 
    * If and how status icons can activated is platform-dependent.
    *
+   * Unlike most G_SIGNAL_ACTION signals, this signal is meant to 
+   * be used by applications and should be wrapped by language bindings.
+   *
    * Since: 2.10
    */
   status_icon_signals [ACTIVATE_SIGNAL] =
@@ -322,6 +325,9 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * The @button and @activate_time parameters should be 
    * passed as the last to arguments to gtk_menu_popup().
    *
+   * Unlike most G_SIGNAL_ACTION signals, this signal is meant to 
+   * be used by applications and should be wrapped by language bindings.
+   *
    * Since: 2.10
    */
   status_icon_signals [POPUP_MENU_SIGNAL] =