diff --git a/ChangeLog b/ChangeLog
index 15fb3423c..ceaec38d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-05-07  Todd Berman  <tberman@sevenl.net>
+
+	* gnome/Gnome.metadata: Hide Druid with_window ctor, map About property.
+	add some null_ok from bug #57948.
+	* gnome/Druid.custom: implement with_window ctor for subclassing, and
+	a 3 paramatered version for when you dont care about the returned
+	window. another 3 parametered version for when you have want null
+	parent, and a 2 parametered version for the null parent and the
+	discarding of the window (THANKS MIKE!)
+	* gnome/Makefile.am: add new custom.
+
 2004-05-07  Mike Kestner  <mkestner@ximian.com>
 
 	* gtk/TreeView.custom : make the NodeStore ctor subclassable.
diff --git a/gnome/Druid.custom b/gnome/Druid.custom
new file mode 100644
index 000000000..69cab5f05
--- /dev/null
+++ b/gnome/Druid.custom
@@ -0,0 +1,49 @@
+		[DllImport("gnomeui-2")]
+		static extern IntPtr gnome_druid_new_with_window(string title, IntPtr parent, bool close_on_cancel, out IntPtr window);
+
+		public Druid (string title, bool close_on_cancel, out Gtk.Widget window) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (Druid)) {
+				CreateNativeObject (new string[0], new GLib.Vlaue [0]);
+				window = ConstructWithWindow (title, null, close_on_cancel);
+				return;
+			}
+			IntPtr window_handle;
+			Raw = gnome_druid_new_with_window (title, IntPtr.Zero, close_on_cancel, window_handle);
+			window = (Gtk.Widget) GLib.Object.GetObject (window_handle);
+		}
+
+		public Druid (string title, bool close_on_cancel) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (Druid)) {
+				CreateNativeObject (new string[0], new GLib.Value[0]);
+				ConstructWithWindow (title, null, close_on_cancel);
+				return;
+			}
+			IntPtr window_handle;
+			Raw = gnome_druid_new_with_window (title, IntPtr.Zero, close_on_cancel, out window_handle);
+		}
+
+		public Druid (string title, Gtk.Window parent, bool close_on_cancel) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (Druid)) {
+				CreateNativeObject (new string[0], new GLib.Value[0]);
+				ConstructWithWindow (title, parent, close_on_cancel);
+				return;
+			}
+			IntPtr window_handle;
+			Raw = gnome_druid_new_with_window (title, (parent != null) ? parent.Handle : IntPtr.Zero, close_on_cancel, out window_handle);
+		}
+
+		public Druid (string title, Gtk.Window parent, bool close_on_cancel, out Gtk.Widget window) : base (IntPtr.Zero)
+		{
+			if (GetType () != typeof (Druid)) {
+				CreateNativeObject (new string[0], new GLib.Value[0]);
+				window = ConstructWithWindow (title, parent, close_on_cancel);
+				return;
+			}
+			IntPtr window_handle;
+			Raw = gnome_druid_new_with_window(title, (parent != null) ? parent.Handle : IntPtr.Zero, close_on_cancel, out window_handle);
+			window = (Gtk.Widget)GLib.Object.GetObject (window_handle);
+                }
+
diff --git a/gnome/Gnome.metadata b/gnome/Gnome.metadata
index 294d4218a..478a7bf0f 100644
--- a/gnome/Gnome.metadata
+++ b/gnome/Gnome.metadata
@@ -15,6 +15,7 @@
   <attr path="/api/namespace/class[@cname='GnomePrint_']/method/*/*[@name='data']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@type='const-gchar**']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@name='logo_pixbuf']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeAbout']/constructor[@cname='gnome_about_new']/*/*[@name='logo_pixbuf']" name="property_name">logo</attr>
   <attr path="/api/namespace/object[@cname='GnomeAppBar']/signal[@name='ClearPrompt']" name="name">PromptCleared</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='C2w']/*/*[@type='double*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='GetButtPoints']/*/*[@type='double*']" name="pass_as">out</attr>
@@ -46,11 +47,19 @@
   <attr path="/api/namespace/object[@cname='GnomeCanvasShape']/property[@name='Dash']" name="type">ArtVpathDash</attr>
   <attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Connect']" name="name">Connected</attr>
   <attr path="/api/namespace/object[@cname='GnomeClient']/signal[@name='Disconnect']" name="name">Disconnected</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruid']/constructor[@cname='gnome_druid_new_with_window']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruid']/method[@cname='gnome_druid_construct_with_window']/*/*[@name='window']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruid']/method[@cname='gnome_druid_construct_with_window']/*/*[@name='parent']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Back']" name="name">BackClicked</attr>
   <attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Cancel']" name="name">CancelClicked</attr>
   <attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Finish']" name="name">FinishClicked</attr>
   <attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Next']" name="name">NextClicked</attr>
   <attr path="/api/namespace/object[@cname='GnomeDruidPage']/signal[@name='Prepare']" name="name">Prepared</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruidPageStandard']/constructor[@cname='gnome_druid_page_standard_new_with_vals']/*/*[@name='logo']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruidPageStandard']/constructor[@cname='gnome_druid_page_standard_new_with_vals']/*/*[@name='top_watermark']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruidPageEdge']/constructor[@cname='gnome_druid_page_edge_new_with_vals']/*/*[@name='logo']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruidPageEdge']/constructor[@cname='gnome_druid_page_edge_new_with_vals']/*/*[@name='watermark']" name="null_ok">1</attr>
+  <attr path="/api/namespace/object[@cname='GnomeDruidPageEdge']/constructor[@cname='gnome_druid_page_edge_new_with_vals']/*/*[@name='top_watermark']" name="null_ok">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeEntry']/method[@name='GtkEntry']" name="name">GetGtkEntry</attr>
   <attr path="/api/namespace/object[@cname='GnomeEntry']/signal[@name='Activate']" name="name">Activated</attr>
   <attr path="/api/namespace/object[@cname='GnomeFileEntry']/method[@name='GnomeEntry']" name="hidden">1</attr>
diff --git a/gnome/Makefile.am b/gnome/Makefile.am
index a57f91c09..a68152943 100644
--- a/gnome/Makefile.am
+++ b/gnome/Makefile.am
@@ -56,6 +56,7 @@ customs =					\
 	CanvasShape.custom			\
 	CanvasText.custom			\
 	CanvasWidget.custom			\
+	Druid.custom				\
 	Font.custom				\
 	FontFamily.custom			\
 	IconList.custom				\