diff --git a/ChangeLog b/ChangeLog
index a9fe907db4..0155a7e9f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-01  Michael Schumacher <schumaml@cvs.gnome.org>
+
+	* app/Makefile.am: added checks and rules to build and link the
+	win32 icon resource if the resource compiler windres is found by
+	configure. First part of a fix for bug #148443.
+
 2004-08-01  Michael Schumacher <schumaml@cvs.gnome.org>
 
 	* libgimpwidgets/gimpwidgets.def: added gimp_preview_area_fill
diff --git a/app/Makefile.am b/app/Makefile.am
index 8c9bc1cd02..22c2918345 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -68,6 +68,10 @@ if OS_WIN32
 mwindows = -mwindows
 endif
 
+if HAVE_WINDRES
+GIMPICONRC = gimprc.o
+endif
+
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gimp\"		\
 	-DGIMP_APP_GLUE_COMPILATION	\
@@ -134,7 +138,8 @@ gimp_2_1_LDADD = \
 	$(GIMP_THREAD_LIBS)		\
 	$(GIMP_MP_LIBS)			\
 	$(RT_LIBS)			\
-	$(INTLLIBS)
+	$(INTLLIBS)			\
+	$(GIMPICONRC)
 
 
 if ENABLE_GIMP_CONSOLE
@@ -177,7 +182,8 @@ gimp_console_2_1_LDADD = \
 	$(GIMP_THREAD_LIBS)		\
 	$(GIMP_MP_LIBS)			\
 	$(RT_LIBS)			\
-	$(INTLLIBS)
+	$(INTLLIBS)			\
+	$(GIMPICONRC)
 
 endif
 
@@ -223,3 +229,6 @@ dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT)
 
 
 dist-hook: dist-check-gimp-console dist-dump-gimprc
+
+gimprc.o:
+	$(WINDRES) gimp.rc gimprc.o