diff --git a/ChangeLog b/ChangeLog
index 82e4e1494..2a698cd17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-29  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gdk/Gdk.metadata : add some array attrs to Pixbuf ctors.
+	* gdk/Pixbuf.custom : remove unneeded overloads.
+	* gdk/gdk-api.xml : regenerated
+
 2003-11-23  Mike Kestner  <mkestner@ximian.com>
 
 	* generator/SignalHandler.cs : use CONNECT_AFTER.
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index b59917006..e2bc6b435 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -17,7 +17,10 @@
   <attr path="//object[@cname='GdkDrawable']/method[@name='DrawLines']" name="hidden">1</attr>
   <attr path="//object[@cname='GdkDrawable']/method[@name='DrawPolygon']" name="hidden">1</attr>
   <attr path="//object[@cname='GdkDrawable']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_data']/*/*[@name='data']" name="array">1</attr>
   <attr path="//object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_file']" name="preferred">1</attr>
+  <attr path="//object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_inline']/*/*[@name='data']" name="array">1</attr>
+  <attr path="//object[@cname='GdkPixbuf']/constructor[@cname='gdk_pixbuf_new_from_xpm_data']/*/*[@name='data']" name="array">1</attr>
   <attr path="//object[@cname='GdkPixbuf']/method[@name='AddAlpha']" name="hidden">1</attr>
   <attr path="//object[@cname='GdkPixbuf']/method[@name='CompositeColorSimple']" name="hidden">1</attr>
   <attr path="//object[@cname='GdkPixbuf']/method[@name='GetFromDrawable']" name="library">libgdk-win32-2.0-0.dll</attr>
diff --git a/gdk/Pixbuf.custom b/gdk/Pixbuf.custom
index f6b65aee3..b2a115472 100644
--- a/gdk/Pixbuf.custom
+++ b/gdk/Pixbuf.custom
@@ -90,17 +90,7 @@
 			return ret;
 		}
 
-//
-// These are temporary bug fixes: there are a number of entry points that
-// are currently miss-generated.
-//
-
-		[DllImport("libgdk_pixbuf-2.0-0.dll")]
-		static extern IntPtr gdk_pixbuf_new_from_data(
-					byte [] data, int colorspace, bool has_alpha, 
-					int bits_per_sample, int width, int height, int rowstride, 
-					GdkSharp.PixbufDestroyNotifyNative destroy_fn, System.IntPtr destroy_fn_data);
-
+		// overload to default the colorspace
 		public Pixbuf(byte [] data, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn)
 		{
 			GdkSharp.PixbufDestroyNotifyWrapper destroy_fn_wrapper = null;
@@ -108,10 +98,6 @@
 			Raw = gdk_pixbuf_new_from_data(data, (int) Gdk.Colorspace.Rgb, has_alpha, bits_per_sample, width, height, rowstride, destroy_fn_wrapper.NativeDelegate, IntPtr.Zero);
 		}
 
-
-		[DllImport("libgdk_pixbuf-2.0-0.dll")]
-		static extern unsafe IntPtr gdk_pixbuf_new_from_inline(int len, byte [] data, bool copy_pixels, out IntPtr error);
-
 		public unsafe Pixbuf(byte[] data, bool copy_pixels)
 		{
 			IntPtr error = IntPtr.Zero;
diff --git a/gdk/gdk-api.xml b/gdk/gdk-api.xml
index c806bf6c0..df4c8cd47 100644
--- a/gdk/gdk-api.xml
+++ b/gdk/gdk-api.xml
@@ -3819,7 +3819,7 @@
       </constructor>
       <constructor cname="gdk_pixbuf_new_from_data">
         <parameters>
-          <parameter type="const-guchar*" name="data" />
+          <parameter type="const-guchar*" name="data" array="1" />
           <parameter type="GdkColorspace" name="colorspace" />
           <parameter type="gboolean" name="has_alpha" />
           <parameter type="int" name="bits_per_sample" />
@@ -3839,14 +3839,14 @@
       <constructor cname="gdk_pixbuf_new_from_inline">
         <parameters>
           <parameter type="gint" name="data_length" />
-          <parameter type="const-guint8*" name="data" />
+          <parameter type="const-guint8*" name="data" array="1" />
           <parameter type="gboolean" name="copy_pixels" />
           <parameter type="GError**" name="error" />
         </parameters>
       </constructor>
       <constructor cname="gdk_pixbuf_new_from_xpm_data">
         <parameters>
-          <parameter type="const-char**" name="data" />
+          <parameter type="const-char**" name="data" array="1" />
         </parameters>
       </constructor>
       <constructor cname="gdk_pixbuf_new_subpixbuf">