diff --git a/.gitattributes b/.gitattributes
index 80edc377bc..dad9456174 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -42,5 +42,5 @@ gnc-scm-info     text eol=lf
 *.vbs text eol=crlf
 
 gnucash.iss.in text eol=crlf
-gnucash.rc     text eol=crlf
+gnucash.rc.in  text eol=crlf
 README*win32-bin.txt text eol=crlf
diff --git a/configure.ac b/configure.ac
index 6ff54b1613..3128bbc7ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1232,7 +1232,6 @@ AC_CONFIG_FILES(
   lib/stf/Makefile
   packaging/Makefile
   packaging/win32/Makefile
-  packaging/win32/gnucash.iss
   src/Makefile
   src/app-utils/Makefile
   src/app-utils/test/Makefile
@@ -1265,7 +1264,6 @@ AC_CONFIG_FILES(
   src/gnc-module/test/mod-baz/Makefile
   src/gnc-module/test/misc-mods/Makefile
   src/gnome/Makefile
-  src/gnome/gnucash.desktop.in
   src/gnome/gtkbuilder/Makefile
   src/gnome/schemas/Makefile
   src/gnome/ui/Makefile
@@ -1350,6 +1348,10 @@ AC_CONFIG_FILES(
   src/plugins/customer_import/gtkbuilder/Makefile
   src/plugins/customer_import/ui/Makefile
   dnl # non-makefiles
+  packaging/win32/gnucash.iss
+  src/bin/gnucash.rc
+  src/gnome/gnucash.desktop.in
+
   dnl # Please read doc/build-system before adding *anything* here
   ,
   dnl # commands go here, but we don't have any right now
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 483df31962..21bb658472 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -30,7 +30,7 @@ GNUCASH_RESOURCE_FILE = gnucash.rc
 dist_noinst_DATA = gnucash.rc
 
 .rc.o:
-	$(AM_V_GEN)$(RC) -i '$<' --input-format=rc -o '$@' -O coff
+	$(AM_V_GEN)$(RC) -I${top_srcdir}/src/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
 
 configdir = ${GNC_CONFIGDIR}
 config_DATA = environment
diff --git a/src/bin/gnucash.rc b/src/bin/gnucash.rc
deleted file mode 100644
index 9699ae6592..0000000000
--- a/src/bin/gnucash.rc
+++ /dev/null
@@ -1 +0,0 @@
-APPLICATION_ICON    ICON          DISCARDABLE     "../pixmaps/gnucash-icon.ico"
diff --git a/src/bin/gnucash.rc.in b/src/bin/gnucash.rc.in
new file mode 100644
index 0000000000..abbaa08d76
--- /dev/null
+++ b/src/bin/gnucash.rc.in
@@ -0,0 +1,33 @@
+#include <windows.h>
+
+APPLICATION_ICON ICON DISCARDABLE "gnucash-icon.ico"
+
+VS_VERSION VERSIONINFO
+ FILEVERSION     @GNUCASH_MAJOR_VERSION@,@GNUCASH_MINOR_VERSION@,@GNUCASH_MICRO_VERSION@,0
+ PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@,@GNUCASH_MINOR_VERSION@,@GNUCASH_MICRO_VERSION@,0
+ FILEFLAGSMASK   0x3fL
+ FILEFLAGS       0x0L
+ FILEOS          VOS__WINDOWS32
+ FILETYPE        VFT_APP
+ FILESUBTYPE     0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "GnuCash Development Team"
+      VALUE "FileDescription", "GnuCash Program File"
+      VALUE "FileVersion", "@VERSION@"
+      VALUE "InternalName", "gnucash"
+      VALUE "LegalCopyright", "©2011 GnuCash Development Team, Licence: GPL v2.0 or later"
+      VALUE "OriginalFilename", "gnucash.exe"
+      VALUE "ProductName", "GnuCash Free Finance Manager"
+      VALUE "ProductVersion", "@VERSION@"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END