diff --git a/ChangeLog b/ChangeLog
index e4e3f5641..624fab680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* gdk/Pixbuf.custom:
+	(LoadResource (assembly, resource)): a null assembly uses the calling
+	assembly.
+
 2003-11-17  Ettore Perazzoli  <ettore@ximian.com>
 
 	* gdk/Pixbuf.custom: Removed the Assembly constructors.
diff --git a/gdk/Pixbuf.custom b/gdk/Pixbuf.custom
index b1498b60a..d533050eb 100644
--- a/gdk/Pixbuf.custom
+++ b/gdk/Pixbuf.custom
@@ -30,6 +30,9 @@
 		
 		static public Pixbuf LoadResource (System.Reflection.Assembly assembly, string resource)
 		{
+			if (assembly == null)
+				return LoadResource (resource);
+
 			System.IO.Stream s = assembly.GetManifestResourceStream (resource);
 			if (s == null)
 				return null;