diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index fec235a2db..89f896ea56 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-12  Matthias Clasen  <mclasne@redhat.com>
+
+	* gdk-pixbuf-io.c (at_scale_size_prepared_cb): Don't let
+	the width or height go below 1.  (#516024, Christian Persch)
+
 2008-02-10  Matthias Clasen  <mclasne@redhat.com>
 
 	* gdk-pixbuf-scaled-anim.c: Try harder to return pixbufs
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 1dbbd26cf9..0770962d0c 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -975,6 +975,9 @@ size_prepared_cb (GdkPixbufLoader *loader,
 			height = info->height;
 	}
 	
+	width = MAX (width, 1);
+        height = MAX (height, 1);
+
 	gdk_pixbuf_loader_set_size (loader, width, height);
 }