diff --git a/ChangeLog b/ChangeLog
index 0f410e74d..0f889876b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-20  Jacob Berkman  <jacob@helixcode.com>
+
+	* configure.in: check for gnome-libs with window icon support
+
+	* acconfig.h: add icon define
+
 2000-06-08  Matthias Warkus  <mawa@iname.com>
 
 	* new_icons/gnome-pack-*.png: Updated.
diff --git a/acconfig.h b/acconfig.h
index f93599a9a..2ee498c82 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -257,3 +257,5 @@
 #endif
 #endif
 
+#undef HAVE_GNOME_WINDOW_ICON
+
diff --git a/configure.in b/configure.in
index a2450499f..f1ae37554 100644
--- a/configure.in
+++ b/configure.in
@@ -552,6 +552,17 @@ GNOME_INIT_HOOK([
 	    xvers="Gnome+$xvers"
 	fi
 	gnomeicondir=`gnome-config --datadir`/pixmaps
+
+dnl Check for new enough gnome-libs
+	CFLAGS_save=$CFLAGS
+	LIBS_save=$LIBS
+	CFLAGS=`gnome-config --cflags gnomeui`
+	LIBS=`gnome-config --libs gnomeui`
+
+	AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, AC_DEFINE(HAVE_GNOME_WINDOW_ICON))
+
+	CFLAGS=$CFLAGS_save
+	LIBS=$LIBS_save
 ])
 AC_SUBST(gnomeicondir)
 AC_SUBST(mx)
diff --git a/src/main.c b/src/main.c
index b4959fcc5..d58e1b315 100644
--- a/src/main.c
+++ b/src/main.c
@@ -142,6 +142,9 @@
 #include "gcorba.h"
 #include "gmain.h"
 #include "gsession.h"
+#ifdef HAVE_GNOME_WINDOW_ICON
+#    include <libgnomeui/gnome-window-icon.h>
+#endif
 #endif
 
 /* "$Id$" */
@@ -2844,9 +2847,12 @@ handle_args (int argc, char *argv [])
     init_corba_with_args (&argc, argv, &ctx);
 #else
     gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx);
-#endif
     maybe_display_linksdir ();
+#endif
 
+#ifdef HAVE_GNOME_WINDOW_ICON
+    gnome_window_icon_set_default_from_file (ICONDIR"/i-directory.png");
+#endif
     gtk_widget_push_visual (gdk_imlib_get_visual ());
     gtk_widget_push_colormap (gdk_imlib_get_colormap ());