diff --git a/ChangeLog b/ChangeLog
index be9d0da..f0effc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-18  Glynn Foster  <glynn.foster@sun.com>
+
+	* data/Makefile.am, data/zenity.png, src/about.c: Hooray! 
+	Zenity now has an about window icon. It's very zen too.
+
 2003-01-18  Glynn Foster  <glynn.foster@sun.com>
 
 	* help/C/zenity.xml: Update the docs a little. I have absolutely
diff --git a/data/Makefile.am b/data/Makefile.am
index 33ba8d0..9f5fbc6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,6 @@
 imagesdir = $(datadir)/zenity/
 images_DATA = \
+	zenity.png		\
 	zenity-calendar.png	\
 	zenity-list.png		\
 	zenity-file.png		\
diff --git a/data/zenity.png b/data/zenity.png
new file mode 100644
index 0000000..3c9c59a
Binary files /dev/null and b/data/zenity.png differ
diff --git a/src/about.c b/src/about.c
index c121cdc..d260f60 100644
--- a/src/about.c
+++ b/src/about.c
@@ -54,7 +54,9 @@ void
 zenity_about (ZenityData *data)
 {
 	GladeXML *glade_dialog = NULL;
+        GdkPixbuf *pixbuf;
 	GtkWidget *label;
+        GtkWidget *image;
         gchar *text;
 
 	glade_dialog = zenity_util_load_glade_file ("zenity_about_dialog");
@@ -74,9 +76,16 @@ zenity_about (ZenityData *data)
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (zenity_about_dialog_response), data);
 
-        /* FIXME: Set an appropriate window icon for the dialog
-         * zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH (""));
-         */
+        zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity.png"));
+
+        image = glade_xml_get_widget (glade_dialog, "zenity_about_image");
+
+        pixbuf = gdk_pixbuf_new_from_file (ZENITY_IMAGE_FULLPATH ("zenity.png"), NULL);
+    
+        if (pixbuf != NULL) {
+                gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
+                g_object_unref (pixbuf);
+        }
 
 	label = glade_xml_get_widget (glade_dialog, "zenity_about_version");
         text = g_strdup_printf ("<span size=\"xx-large\" weight=\"bold\">Zenity %s</span>", VERSION);