diff --git a/ChangeLog b/ChangeLog
index a9e59b6266..edf2e88b2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-20  Stefan Kost  <ensonic@users.sf.net>
+
+	Patch by: René Stadler <mail at renestadler dot de>
+
+	* ext/libpng/gstpngenc.c:
+	  Don't leak buffer data memory. Fixes #498395.
+
 2007-11-20  Stefan Kost  <ensonic@users.sf.net>
 
 	Patch by: René Stadler <mail at renestadler dot de>
diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c
index 5a93ccb0e0..0ca9bb3a73 100644
--- a/ext/libpng/gstpngenc.c
+++ b/ext/libpng/gstpngenc.c
@@ -228,7 +228,8 @@ user_write_data (png_structp png_ptr, png_bytep data, png_uint_32 length)
   pngenc = (GstPngEnc *) png_get_io_ptr (png_ptr);
 
   buffer = gst_buffer_new ();
-  GST_BUFFER_DATA (buffer) = g_memdup (data, length);
+  GST_BUFFER_MALLOCDATA (buffer) = g_memdup (data, length);
+  GST_BUFFER_DATA (buffer) = GST_BUFFER_MALLOCDATA (buffer);
   GST_BUFFER_SIZE (buffer) = length;
 
   if (pngenc->buffer_out) {