diff --git a/ChangeLog b/ChangeLog
index 03478e6cf..ed85f17d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-06  Mike Kestner  <mkestner@novell.com>
+
+	* doc/en/*/*.xml : docs for new GValue members and size_t changes.
+	* generator/SymbolTable.cs : add ssize_t and make size_t a UIntPtr
+	instead of the current broken int mapping on 64 bit platforms.
+	* gtkhtml/HTMLStream.custom : fix size_t related overload.
+	[fixes #69574]
+
 2004-12-03  Dan Winship  <danw@novell.com>
 
 	* gdk/gdk-symbols.xml: alias GdkBitmap to GdkPixmap [Fixes #68824]
diff --git a/doc/en/GLib/GType.xml b/doc/en/GLib/GType.xml
index 3872a2ff4..96629fd45 100644
--- a/doc/en/GLib/GType.xml
+++ b/doc/en/GLib/GType.xml
@@ -4,7 +4,7 @@
     <AssemblyName>glib-sharp</AssemblyName>
     <AssemblyPublicKey>
     </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyCulture>neutral</AssemblyCulture>
     <Attributes />
   </AssemblyInfo>
@@ -317,5 +317,31 @@ public class MagrittesWindow : Window {
         <remarks />
       </Docs>
     </Member>
+    <Member MemberName="Int64">
+      <MemberSignature Language="C#" Value="public static GLib.GType Int64;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>64 bit integer type.</summary>
+        <remarks />
+      </Docs>
+    </Member>
+    <Member MemberName="UInt64">
+      <MemberSignature Language="C#" Value="public static GLib.GType UInt64;" />
+      <MemberType>Field</MemberType>
+      <ReturnValue>
+        <ReturnType>GLib.GType</ReturnType>
+      </ReturnValue>
+      <Parameters>
+      </Parameters>
+      <Docs>
+        <summary>64 bit unsigned integer type.</summary>
+        <remarks />
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/GLib/Value.xml b/doc/en/GLib/Value.xml
index 18afa8bdd..5a8649a76 100644
--- a/doc/en/GLib/Value.xml
+++ b/doc/en/GLib/Value.xml
@@ -164,7 +164,8 @@
       <Parameters />
       <Docs>
         <summary>Disposes the underlying value</summary>
-        <remarks></remarks>
+        <remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -192,12 +193,12 @@
         <Parameter Name="val" Type="GLib.Opaque" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Constructs a value for an Opaque type.</summary>
         <param name="obj">a <see cref="T:System.IntPtr" /></param>
         <param name="prop_name">a <see cref="T:System.String" /></param>
         <param name="val">a <see cref="T:GLib.Opaque" /></param>
         <returns>a <see cref="T:GLib.Value" /></returns>
-        <remarks>To be added</remarks>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName="Val">
@@ -208,9 +209,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added</summary>
+        <summary>Accesses the value.</summary>
         <returns>a <see cref="T:System.Object" /></returns>
-        <remarks>To be added</remarks>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -221,10 +222,10 @@
         <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Constructs an initialized value for a given type.</summary>
         <param name="gtype">a <see cref="T:GLib.GType" /></param>
         <returns>a <see cref="T:GLib.Value" /></returns>
-        <remarks>To be added</remarks>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName="Empty">
@@ -236,8 +237,8 @@
       <Parameters>
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
+        <summary>An unitialized value.</summary>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName="Init">
@@ -250,9 +251,9 @@
         <Parameter Name="gtype" Type="GLib.GType" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Initializes a value to a given type.</summary>
         <param name="gtype">a <see cref="T:GLib.GType" /></param>
-        <remarks>To be added</remarks>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -264,11 +265,11 @@
         <Parameter Name="prop_name" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Constructs a value initialized for a given property name.</summary>
         <param name="obj">a <see cref="T:GLib.Object" /></param>
         <param name="prop_name">a <see cref="T:System.String" /></param>
         <returns>a <see cref="T:GLib.Value" /></returns>
-        <remarks>To be added</remarks>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -281,12 +282,12 @@
         <Parameter Name="wrap" Type="GLib.EnumWrapper" />
       </Parameters>
       <Docs>
-        <summary>To be added</summary>
+        <summary>Constructs a value initialized to a given enumerated type property.</summary>
         <param name="obj">a <see cref="T:GLib.Object" /></param>
         <param name="prop_name">a <see cref="T:System.String" /></param>
         <param name="wrap">a <see cref="T:GLib.EnumWrapper" /></param>
         <returns>a <see cref="T:GLib.Value" /></returns>
-        <remarks>To be added</remarks>
+        <remarks />
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -298,11 +299,12 @@
         <Parameter Name="type_name" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>Constructs a Value from an <see cref="T:GLib.Opaque"/> object of a given type</summary>
+        <summary>Constructs a Value from an <see cref="T:GLib.Opaque" /> object of a given type</summary>
         <param name="val">an <see cref="T:GLib.Opaque" /> object</param>
-        <param name="type_name">the (C/GType) name of <paramref name="val"/>'s type</param>
+        <param name="type_name">the (C/GType) name of <paramref name="val" />'s type</param>
         <returns>an object of type <see cref="T:GLib.Value" /></returns>
-        <remarks></remarks>
+        <remarks>
+        </remarks>
       </Docs>
     </Member>
     <Member MemberName=".ctor">
@@ -314,12 +316,41 @@
         <Parameter Name="type_name" Type="System.String" />
       </Parameters>
       <Docs>
-        <summary>Constructs a Value from an <see cref="T:GLib.Opaque"/> object of a given type</summary>
+        <summary>Constructs a Value from an <see cref="T:GLib.Opaque" /> object of a given type</summary>
         <param name="wrap">an <see cref="T:GLib.EnumWrapper" /> value</param>
-        <param name="type_name">the (C/GType) name of <paramref name="wrap"/>'s type</param>
+        <param name="type_name">the (C/GType) name of <paramref name="wrap" />'s type</param>
         <returns>an object of type <see cref="T:GLib.Value" /></returns>
-        <remarks></remarks>
+        <remarks>
+        </remarks>
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (long val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.Int64" />
+      </Parameters>
+      <Docs>
+        <summary>Constructs a value for a 64 bit integer.</summary>
+        <param name="val">a <see cref="T:System.Int64" /></param>
+        <returns>a <see cref="T:GLib.Value" /></returns>
+        <remarks />
+      </Docs>
+    </Member>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public Value (ulong val);" />
+      <MemberType>Constructor</MemberType>
+      <ReturnValue />
+      <Parameters>
+        <Parameter Name="val" Type="System.UInt64" />
+      </Parameters>
+      <Docs>
+        <summary>Constructs a value for a 64 bit unsigned integer.</summary>
+        <param name="val">a <see cref="T:System.UInt64" /></param>
+        <returns>a <see cref="T:GLib.Value" /></returns>
+        <remarks />
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/HTML.xml b/doc/en/Gtk/HTML.xml
index 108071c1f..a983e2a81 100644
--- a/doc/en/Gtk/HTML.xml
+++ b/doc/en/Gtk/HTML.xml
@@ -277,7 +277,7 @@ namespace HtmlTest
       </Docs>
     </Member>
     <Member MemberName="Write">
-      <MemberSignature Language="C#" Value="public void Write (Gtk.HTMLStream handle, string buffer, int size);" />
+      <MemberSignature Language="C#" Value="public void Write (Gtk.HTMLStream handle, string buffer, UIntPtr size);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
@@ -285,13 +285,13 @@ namespace HtmlTest
       <Parameters>
         <Parameter Name="handle" Type="Gtk.HTMLStream" />
         <Parameter Name="buffer" Type="System.String" />
-        <Parameter Name="size" Type="System.Int32" />
+        <Parameter Name="size" Type="System.UIntPtr" />
       </Parameters>
       <Docs>
         <summary>Writes <paramref name="size" /> bytes of content from <paramref name="buffer" /> to <paramref name="handle" />.</summary>
-        <param name="handle">an object of type <see cref="T:Gtk.HTMLStream" /></param>
-        <param name="buffer">an object of type <see cref="T:System.String" /></param>
-        <param name="size">an object of type <see cref="T:System.Int32" /></param>
+        <param name="handle">a <see cref="T:Gtk.HTMLStream" /></param>
+        <param name="buffer">a <see cref="T:System.String" /></param>
+        <param name="size">a <see cref="T:System.UIntPtr" /></param>
         <remarks />
       </Docs>
     </Member>
@@ -2085,4 +2085,4 @@ class X {
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/HTMLSaveReceiverFn.xml b/doc/en/Gtk/HTMLSaveReceiverFn.xml
index 48ce16b6a..8b497d711 100644
--- a/doc/en/Gtk/HTMLSaveReceiverFn.xml
+++ b/doc/en/Gtk/HTMLSaveReceiverFn.xml
@@ -1,5 +1,5 @@
 <Type Name="HTMLSaveReceiverFn" FullName="Gtk.HTMLSaveReceiverFn">
-  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed delegate bool HTMLSaveReceiverFn (IntPtr engine, string data);" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed delegate bool HTMLSaveReceiverFn (IntPtr engine, string data, UIntPtr len);" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/Gtk/HTMLStream.xml b/doc/en/Gtk/HTMLStream.xml
index b73f5aae6..00bbde3ae 100644
--- a/doc/en/Gtk/HTMLStream.xml
+++ b/doc/en/Gtk/HTMLStream.xml
@@ -98,19 +98,19 @@
       </Docs>
     </Member>
     <Member MemberName="Write">
-      <MemberSignature Language="C#" Value="public void Write (byte [] buffer, int size);" />
+      <MemberSignature Language="C#" Value="public void Write (byte [] buffer, UIntPtr size);" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="buffer" Type="System.Byte []" />
-        <Parameter Name="size" Type="System.Int32" />
+        <Parameter Name="buffer" Type="System.Byte[]" />
+        <Parameter Name="size" Type="System.UIntPtr" />
       </Parameters>
       <Docs>
         <summary>Write the HTML to <paramref name="buffer" />.</summary>
-        <param name="buffer">A <see cref="T:byte []" /></param>
-        <param name="size">A <see cref="T:System.Int32" /></param>
+        <param name="buffer">a <see cref="T:System.Byte" /></param>
+        <param name="size">a <see cref="T:System.UIntPtr" /></param>
         <remarks />
       </Docs>
     </Member>
@@ -161,4 +161,4 @@
       </Docs>
     </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/doc/en/Gtk/HTMLStreamWriteFunc.xml b/doc/en/Gtk/HTMLStreamWriteFunc.xml
index a49a09b75..6fd20fd05 100644
--- a/doc/en/Gtk/HTMLStreamWriteFunc.xml
+++ b/doc/en/Gtk/HTMLStreamWriteFunc.xml
@@ -1,5 +1,5 @@
 <Type Name="HTMLStreamWriteFunc" FullName="Gtk.HTMLStreamWriteFunc">
-  <TypeSignature Language="C#" Value="public sealed delegate void HTMLStreamWriteFunc (Gtk.HTMLStream stream, string buffer, int size);" Maintainer="auto" />
+  <TypeSignature Language="C#" Maintainer="auto" Value="public sealed delegate void HTMLStreamWriteFunc (Gtk.HTMLStream stream, string buffer, UIntPtr size);" />
   <AssemblyInfo>
     <AssemblyName>gtkhtml-sharp</AssemblyName>
     <AssemblyVersion>0.0.0.0</AssemblyVersion>
diff --git a/doc/en/Rsvg/Global.xml b/doc/en/Rsvg/Global.xml
index 091a73b58..8a6d7c5e0 100644
--- a/doc/en/Rsvg/Global.xml
+++ b/doc/en/Rsvg/Global.xml
@@ -161,23 +161,6 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
-    <Member MemberName="ParseCssbuffer">
-      <MemberSignature Language="C#" Value="public static void ParseCssbuffer (Rsvg.Handle ctx, string buff);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="ctx" Type="Rsvg.Handle" />
-        <Parameter Name="buff" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="ctx">a <see cref="T:Rsvg.Handle" /></param>
-        <param name="buff">a <see cref="T:System.String" /></param>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="IsStyleArg">
       <MemberSignature Language="C#" Value="public static bool IsStyleArg (string str);" />
       <MemberType>Method</MemberType>
@@ -258,5 +241,24 @@
         <remarks>To be added</remarks>
       </Docs>
     </Member>
+    <Member MemberName="ParseCssbuffer">
+      <MemberSignature Language="C#" Value="public static void ParseCssbuffer (Rsvg.Handle ctx, string buff, UIntPtr buflen);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="ctx" Type="Rsvg.Handle" />
+        <Parameter Name="buff" Type="System.String" />
+        <Parameter Name="buflen" Type="System.UIntPtr" />
+      </Parameters>
+      <Docs>
+        <summary>To be added</summary>
+        <param name="ctx">a <see cref="T:Rsvg.Handle" /></param>
+        <param name="buff">a <see cref="T:System.String" /></param>
+        <param name="buflen">a <see cref="T:System.UIntPtr" /></param>
+        <remarks>To be added</remarks>
+      </Docs>
+    </Member>
   </Members>
-</Type>
\ No newline at end of file
+</Type>
diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs
index e2d729c19..c94e74576 100644
--- a/generator/SymbolTable.cs
+++ b/generator/SymbolTable.cs
@@ -92,7 +92,8 @@ namespace GtkSharp.Generation {
 			// but this should work for now
 			AddType (new SimpleGen ("gsize", "uint"));
 			AddType (new SimpleGen ("gssize", "int"));
-			AddType (new SimpleGen ("size_t", "int"));
+			AddType (new SimpleGen ("size_t", "System.UIntPtr"));
+			AddType (new SimpleGen ("ssize_t", "System.IntPtr"));
 			
 			// FIXME: These ought to be handled properly.
 			AddType (new SimpleGen ("GMemChunk", "IntPtr"));
diff --git a/gtkhtml/HTMLStream.custom b/gtkhtml/HTMLStream.custom
index d80fa9367..c0c1036ec 100644
--- a/gtkhtml/HTMLStream.custom
+++ b/gtkhtml/HTMLStream.custom
@@ -23,5 +23,5 @@ public void Write (string buffer)
 {
 	byte [] bytes = System.Text.Encoding.UTF8.GetBytes (buffer);
 
-	gtk_html_stream_write (Handle, bytes, bytes.Length);
+	gtk_html_stream_write (Handle, bytes, new UIntPtr ((ulong)bytes.Length));
 }