--- a/browser/app/module.ver
+++ b/browser/app/module.ver
@@ -1,8 +1,8 @@
 WIN32_MODULE_COMPANYNAME=Mozilla Corporation
 WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_PRODUCTVERSION=3,6,0,0
-WIN32_MODULE_PRODUCTVERSION_STRING=3.6a1pre
+WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
+WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation.
-WIN32_MODULE_DESCRIPTION=Firefox
-WIN32_MODULE_PRODUCTNAME=Firefox
-WIN32_MODULE_NAME=Firefox
+WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

--- a/browser/app/splash.rc
+++ b/browser/app/splash.rc
@@ -42,17 +42,17 @@
 1 24 "firefox.exe.manifest"
 
 IDI_APPICON ICON FIREFOX_ICO
 IDI_DOCUMENT ICON DOCUMENT_ICO
 IDI_APPLICATION ICON FIREFOX_ICO
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_STARTMENU_APPNAME,              "Firefox"
+    IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
 END
 
 #ifdef MOZ_STATIC_BUILD
 
 // XXX This code is copied from resource.h and widget.rc.  It's a work-around
 // for the limitation that only one resource file can be used in an .exe.  We
 // should develop a method, for static builds only, to combine multiple .rc
 // files into a single .rc file, and then use that to build the single .res