diff --git a/ChangeLog b/ChangeLog
index e0ad1e573e..8321f387b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-06  Sven Neumann  <sven@gimp.org>
+
+	New Win32 icons contributed by Jernej Simoncic:
+	
+	* app/Makefile.am
+	* app/makefile.msc
+	* app/gimp.rc
+	* app/fileicon.ico: added new file icon for the Win32 build.
+
+	* app/wilber.ico: nicer application icon for the Win32 build.
+
 2004-11-05  Michael Natterer  <mitch@gimp.org>
 
 	* plug-ins/maze/maze.c
diff --git a/app/Makefile.am b/app/Makefile.am
index bd31bf51a6..b93efb006f 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -56,6 +56,7 @@ gimp_2_2_SOURCES = $(app_sources)
 EXTRA_DIST = \
 	makefile.msc	\
 	gimp.rc		\
+	fileicon.ico	\
 	wilber.ico
 
 
diff --git a/app/fileicon.ico b/app/fileicon.ico
new file mode 100755
index 0000000000..ba30d02a6c
Binary files /dev/null and b/app/fileicon.ico differ
diff --git a/app/gimp.rc b/app/gimp.rc
index 946d958fd1..d82864696b 100644
--- a/app/gimp.rc
+++ b/app/gimp.rc
@@ -1 +1,2 @@
 wilber			ICON	"wilber.ico"
+fileicon		ICON	"fileicon.ico"
diff --git a/app/makefile.msc b/app/makefile.msc
index 1afc5fe3a2..8906c55b70 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -107,6 +107,7 @@ EXTRA_DIST = \
 	makefile.msc \
 	gimp.rc \
 	gimp.sym \
+	fileicon.ico \
 	wilber.ico \
 	arch/i386/mmx/detect_mmx.S \
 	arch/i386/mmx/paint_funcs_mmx.S \
diff --git a/app/wilber.ico b/app/wilber.ico
index 68408bf1cf..7c8863d88b 100755
Binary files a/app/wilber.ico and b/app/wilber.ico differ