diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 1369c724ba..89631a8412 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -3674,6 +3674,7 @@ gtk_status_icon_set_has_tooltip
 gtk_status_icon_get_has_tooltip
 gtk_status_icon_set_title
 gtk_status_icon_get_title
+gtk_status_icon_set_name
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
 gtk_status_icon_set_blinking
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 2834c074df..6a910bb7d3 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1244,6 +1244,7 @@ gtk_status_icon_get_geometry
 gtk_status_icon_get_x11_window_id
 gtk_status_icon_get_title
 gtk_status_icon_set_title
+gtk_status_icon_set_name
 #endif
 #endif
 
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 2492af8850..1fe57442e6 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2969,5 +2969,35 @@ gtk_status_icon_get_title (GtkStatusIcon *status_icon)
 }
 
 
+/**
+ * gtk_status_icon_set_name:
+ * @status_icon: a #GtkStatusIcon
+ * @name: the name
+ *
+ * Sets the name of this tray icon.
+ * This should be a string identifying this icon. It is may be
+ * used for sorting the icons in the tray and will not be shown to
+ * the user.
+ *
+ * Since: 2.20
+ */
+void
+gtk_status_icon_set_name (GtkStatusIcon *status_icon,
+                          const gchar   *name)
+{
+  GtkStatusIconPrivate *priv;
+
+  g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
+
+  priv = status_icon->priv;
+
+#ifdef GDK_WINDOWING_X11
+  gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name);
+#endif
+
+  g_object_notify (G_OBJECT (status_icon), "name");
+}
+
+
 #define __GTK_STATUS_ICON_C__
 #include "gtkaliasdef.c"
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index e850c64c79..0c08cfe212 100755
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -123,6 +123,8 @@ void                  gtk_status_icon_set_tooltip_markup (GtkStatusIcon      *st
 void                  gtk_status_icon_set_title          (GtkStatusIcon      *status_icon,
                                                           const gchar        *title);
 G_CONST_RETURN gchar *gtk_status_icon_get_title          (GtkStatusIcon      *status_icon);
+void                  gtk_status_icon_set_name           (GtkStatusIcon      *status_icon,
+                                                          const gchar        *name);
 void                  gtk_status_icon_set_visible        (GtkStatusIcon      *status_icon,
 							  gboolean            visible);
 gboolean              gtk_status_icon_get_visible        (GtkStatusIcon      *status_icon);