diff --git a/ChangeLog b/ChangeLog
index 5fc271e4b..465d2db01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-03  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* gtk/Gtk.metadata:
+	* gtk/StatusIcon.custom: Obsolete the duplicated properties.
+
 2008-10-29  Mike Kestner  <mkestner@novell.com>
 
 	* glib/Signal.cs : custom marshaling hooks
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index f5b8e6378..968105d89 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -561,6 +561,10 @@
   <attr path="/api/namespace/object[@cname='GtkSpinButton']/constructor[@cname='gtk_spin_button_new_with_range']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='GetGeometry']/*/*[@name='screen']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='GetGeometry']/*/*[@name='area']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='SetFromStock']" name="name">SetStock</attr>
+  <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='SetFromPixbuf']" name="name">SetPixbuf</attr>
+  <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='SetFromIconName']" name="name">SetIconName</attr>
+  <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='SetFromFile']" name="name">SetFile</attr>
   <attr path="/api/namespace/object[@cname='GtkStyle']/field[@type='GdkGC*']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkStyle']/method[@name='LookupColor']/*/*[@name='color']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/constructor[@cname='gtk_table_new']/*/*[@name='columns']" name="property_name">n_columns</attr>
diff --git a/gtk/StatusIcon.custom b/gtk/StatusIcon.custom
index da67f218f..5ad48a1c6 100644
--- a/gtk/StatusIcon.custom
+++ b/gtk/StatusIcon.custom
@@ -1,8 +1,9 @@
 // StatusIcon.custom - customizations to Gtk.StatusIcon
 //
 // Authors: Mike Kestner  <mkestner@novell.com>
+// Authors: Stephane Delcroix  <sdelcroix@novell.com>
 //
-// Copyright (c) 2007 Novell, Inc.
+// Copyright (c) 2007-2008 Novell, Inc.
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of version 2 of the Lesser GNU General 
@@ -33,3 +34,38 @@
 			gtksharp_gtk_status_icon_present_menu (Handle, menu == null ? IntPtr.Zero : menu.Handle, button, activate_time);
 		}
 
+		[Obsolete ("use the File property instead")]
+		public string FromFile { 
+			set {
+				IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value);
+				gtk_status_icon_set_from_file(Handle, native_value);
+				GLib.Marshaller.Free (native_value);
+			}
+		}
+
+		[Obsolete ("use the IconName property instead")]
+		public string FromIconName { 
+			set {
+				IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value);
+				gtk_status_icon_set_from_icon_name(Handle, native_value);
+				GLib.Marshaller.Free (native_value);
+			}
+		}
+
+		[Obsolete ("use the Pixbuf property instead")]
+		public Gdk.Pixbuf FromPixbuf { 
+			set {
+				gtk_status_icon_set_from_pixbuf(Handle, value == null ? IntPtr.Zero : value.Handle);
+			}
+		}
+
+		[Obsolete ("use the Stock property instead")]
+		public string FromStock { 
+			set {
+				IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value);
+				gtk_status_icon_set_from_stock(Handle, native_value);
+				GLib.Marshaller.Free (native_value);
+			}
+		}
+
+