diff --git a/ChangeLog b/ChangeLog
index b73d2cc4d..078fd8900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* gtkhtml/Gtk.metadata: Patch from Mike Kestner: make
+	GtkHTMLStream opaque, to fix a bug that was found by running
+	Monodoc on MacOS X.  We were passing a pointer to a managed
+	object, instead of a pointer to a HTMLStream-allocated object.
+
+	* HTMLStream.custom: Update custom file to reflect change to
+	Opaque: use Handle instead of this.
+
 2004-04-30  Mike Kestner  <mkestner@ximian.com>
 
 	* gdk/glue/makefile.win32 : remove windowmanager.o for now. It
diff --git a/gtkhtml/Gtk.metadata b/gtkhtml/Gtk.metadata
index f2a65afec..aa44703f3 100644
--- a/gtkhtml/Gtk.metadata
+++ b/gtkhtml/Gtk.metadata
@@ -3,6 +3,7 @@
   <attr path="//object[@cname='GtkHTML']/signal[@name='Command']" name="name">OnCommand</attr>
   <attr path="//object[@cname='GtkHTML']/method[@name='BeginContent']" name="name">Begin</attr>
   <attr path="//object[@cname='GtkHTML']/method[@name='BeginFull']" name="name">Begin</attr>
+  <attr path="//struct[@cname='GtkHTMLStream']" name="opaque">1</attr>
   <attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="type">const-guchar*</attr>
   <attr path="//struct[@cname='GtkHTMLStream']/method[@name='Write']/*/*[@name='buffer']" name="array">1</attr>
 </metadata>
diff --git a/gtkhtml/HTMLStream.custom b/gtkhtml/HTMLStream.custom
index d11a6fea4..20f764ad2 100644
--- a/gtkhtml/HTMLStream.custom
+++ b/gtkhtml/HTMLStream.custom
@@ -2,5 +2,5 @@ public void Write (string buffer)
 {
 	byte [] bytes = System.Text.Encoding.UTF8.GetBytes (buffer);
 
-	gtk_html_stream_write (ref this, bytes, bytes.Length);
+	gtk_html_stream_write (Handle, bytes, bytes.Length);
 }