diff --git a/ChangeLog b/ChangeLog
index 87f5896e4..44fb6da1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-26  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* gtk/Image.custom:
+	* gtk/Gtk.metadata: obsolete Image.FromPixbuf, FromAnimation,
+	FromFile setters in favor of already existing Pixbuf, Animation and
+	File.
+
 2008-11-26  Mike Kestner  <mkestner@novell.com>
 
 	* bootstrap-2.12: bump svn version.
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index dd445312c..061622b49 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -438,6 +438,9 @@
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='GetPixmap']/*/*[@name='pixmap']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='GetPixmap']/*/*[@name='mask']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='GetStock']/*/*[@name='stock_id']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromAnimation']" name="name">SetAnimation</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromFile']" name="name">SetFile</attr>
+  <attr path="/api/namespace/object[@cname='GtkImage']/method[@name='SetFromPixbuf']" name="name">SetPixbuf</attr>
   <attr path="/api/namespace/object[@cname='GtkIMContext']/signal[@name='DeleteSurrounding']" name="name">SurroundingDeleted</attr>
   <attr path="/api/namespace/object[@cname='GtkIMContext']/method[@name='GetPreeditString']/*/*[@name='str']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkIMContext']/method[@name='GetPreeditString']/*/*[@name='attrs']" name="pass_as">out</attr>
diff --git a/gtk/Image.custom b/gtk/Image.custom
index f1d6b344c..923ffb24e 100644
--- a/gtk/Image.custom
+++ b/gtk/Image.custom
@@ -1,6 +1,9 @@
 // Image.custom - Customizations to Gtk.Image
 //
-// Copyright (C) 2004 Novell, Inc.
+// Authors: Mike Kestner  <mkestner@novell.com>
+// Authors: Stephane Delcroix  <sdelcroix@novell.com>
+//
+// Copyright (c) 2004-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 
@@ -88,3 +91,28 @@
 		{
 			return new Image (System.Reflection.Assembly.GetCallingAssembly (), resource);
 		}
+
+		[Obsolete ("Use the Animation property instead")]
+		public Gdk.PixbufAnimation FromAnimation {
+			set {
+				gtk_image_set_from_animation(Handle, value == null ? IntPtr.Zero : value.Handle);
+			}
+		}
+
+		[Obsolete ("Use the File property instead")]
+		public string FromFile {
+			set {
+				IntPtr native_value = GLib.Marshaller.StringToPtrGStrdup (value);
+				gtk_image_set_from_file(Handle, native_value);
+				GLib.Marshaller.Free (native_value);
+			}
+		}
+
+		[Obsolete ("Use the Pixbuf property instead")]
+		public Gdk.Pixbuf FromPixbuf {
+			set {
+				gtk_image_set_from_pixbuf(Handle, value == null ? IntPtr.Zero : value.Handle);
+			}
+		}
+
+