diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 619ddddedf..042c28282d 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-19  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gdk-pixbuf-io.c: Don't call fill_info if we've already filled
+	the info from the module file, fixes a small memory leak.
+	
 2008-09-18  Dominic Lachowicz  <domlachowicz@gmail.com>
 
 	* io-gdip-utils.c: Fix 2 cases where we leaked a GpImage (#552545)
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index d6ddce76a2..c24d456066 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -678,9 +678,10 @@ gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
         if (fill_vtable) {
 		image_module->module = (void *) 1;
                 (* fill_vtable) (image_module);
-		image_module->info = g_new0 (GdkPixbufFormat, 1);
-		(* fill_info) (image_module->info);
-
+		if (image_module->info == NULL) {
+			image_module->info = g_new0 (GdkPixbufFormat, 1);
+			(* fill_info) (image_module->info);
+		}
                 return TRUE;
 	}
 	else