diff --git a/gio/ChangeLog b/gio/ChangeLog
index ad28fb9a7..2ad074d75 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-02  Michael Natterer  <mitch@imendio.com>
+
+	* gbufferedoutputstream.h (struct _GBufferedOutputStreamClass):
+	fix parent_class member to be GFilterOutputStreamClass (not
+	GOutputStreamClass). Drop three pointers of padding, which is
+	exactly what GFilterOutputStreamClass adds to GOutputStreamClass,
+	so the class struct size stays the same.
+
 2008-09-02  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 550059 – Wrong docs for g_emblemed_icon_add_emblem
diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h
index 492259d3c..106bca704 100644
--- a/gio/gbufferedoutputstream.h
+++ b/gio/gbufferedoutputstream.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: Christian Kellner <gicmo@gnome.org> 
+ * Author: Christian Kellner <gicmo@gnome.org>
  */
 
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 /**
  * GBufferedOutputStream:
  * @parent_class: The parent class.
- * 
+ *
  * An implementation of #GFilterOutputStream with a sized buffer.
  **/
 typedef struct _GBufferedOutputStreamClass    GBufferedOutputStreamClass;
@@ -57,19 +57,16 @@ struct _GBufferedOutputStream
 
 struct _GBufferedOutputStreamClass
 {
- GOutputStreamClass parent_class;
+  GFilterOutputStreamClass parent_class;
 
   /*< private >*/
   /* Padding for future expansion */
   void (*_g_reserved1) (void);
   void (*_g_reserved2) (void);
-  void (*_g_reserved3) (void);
-  void (*_g_reserved4) (void);
-  void (*_g_reserved5) (void);
 };
 
 
-GType           g_buffered_output_stream_get_type  (void) G_GNUC_CONST;
+GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
 GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
 GOutputStream* g_buffered_output_stream_new_sized       (GOutputStream         *base_stream,
 							 gsize                  size);