diff --git a/configure.ac b/configure.ac
index 1e7075b8b..788f76111 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,11 +228,7 @@ case $host_os in
      else
        hostaliaswindres="$host_alias-windres";
      fi
-     AC_PATH_PROGS([WINDRES], [windres $hostaliaswindres $host_os-windres])
-     if test "x$WINDRES" = "x"; then
-       AC_MSG_ERROR([windres could not be found within your path.])
-     fi
-     AC_SUBST(WINDRES)
+     AC_CHECK_TOOL(WINDRES, windres)
      ;;
 
   *beos*)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8278cabf3..fc6a74ccb 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -120,6 +120,18 @@ tr-core-dbus.h: $(srcdir)/tr-core-dbus.xml
 	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tr_core $< > $(@F)
 
 if WIN32
+transmission.res: transmission.rc
+        $(WINDRES) -J rc -i transmission.rc -O coff -o transmission.res
+
+BUILT_SOURCES = \
+        transmission.res
+
+CLEANFILES += \
+        transmission.res
+
+transmission_LDADD += \
+        transmission.res
+
 transmission_LDFLAGS = \
 	-mwindows
 endif
diff --git a/gtk/transmission.ico b/gtk/transmission.ico
new file mode 100644
index 000000000..a11bbb337
Binary files /dev/null and b/gtk/transmission.ico differ
diff --git a/gtk/transmission.rc b/gtk/transmission.rc
new file mode 100644
index 000000000..511a6a648
--- /dev/null
+++ b/gtk/transmission.rc
@@ -0,0 +1 @@
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "transmission.ico"