diff --git a/mozilla/xpinstall/wizard/windows/setup/config.ini b/mozilla/xpinstall/wizard/windows/setup/config.ini
index 996072b253d..9487ca4cc1d 100644
--- a/mozilla/xpinstall/wizard/windows/setup/config.ini
+++ b/mozilla/xpinstall/wizard/windows/setup/config.ini
@@ -292,7 +292,7 @@ url0=ftp://sweetlou.mcom.com/products/client/seamonkey/windows/32bit/x86/current
 
 
 ;[Core]
-;Source=[JAR PATH]\base.xpi
+;Source=[XPI PATH]\base.xpi
 ;Destination=[TEMP]\core.ns
 ;Cleanup=TRUE
 ;Message=Preparing SmartUpdate, please wait...
@@ -310,13 +310,13 @@ url0=ftp://sweetlou.mcom.com/products/client/seamonkey/windows/32bit/x86/current
 
 [Uncompress File0]
 Timing=post download
-Source=[JAR PATH]\base.xpi
+Source=[XPI PATH]\base.xpi
 Destination=[SETUP PATH]
 Message=Configuring Seamonkey, please wait...
 
 [Uncompress File1]
 Timing=post download
-Source=[JAR PATH]\extratest.xpi
+Source=[XPI PATH]\extratest.xpi
 Destination=[SETUP PATH]
 Message=Configuring Extra test files, please wait...
 
diff --git a/mozilla/xpinstall/wizard/windows/setup/extra.c b/mozilla/xpinstall/wizard/windows/setup/extra.c
index 8716ec422cc..eeafbace6a0 100644
--- a/mozilla/xpinstall/wizard/windows/setup/extra.c
+++ b/mozilla/xpinstall/wizard/windows/setup/extra.c
@@ -2706,8 +2706,8 @@ HRESULT DecriptString(LPSTR szOutputStr, LPSTR szInputStr)
 
     szPrepend[dwPrepend] = '\0';
 
-    /* if Variable is "JAR PATH", do special processing */
-    if(lstrcmpi(szVariable, "JAR PATH") == 0)
+    /* if Variable is "XPI PATH", do special processing */
+    if(lstrcmpi(szVariable, "XPI PATH") == 0)
     {
       lstrcpy(szBuf, sgProduct.szAlternateArchiveSearchPath);
       RemoveBackSlash(szBuf);
diff --git a/mozilla/xpinstall/wizard/windows/setup/resource.h b/mozilla/xpinstall/wizard/windows/setup/resource.h
index 51b18e701e4..4fa8252ccd3 100644
--- a/mozilla/xpinstall/wizard/windows/setup/resource.h
+++ b/mozilla/xpinstall/wizard/windows/setup/resource.h
@@ -1,3 +1,8 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by setup.rc
+//
+
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * The contents of this file are subject to the Netscape Public License
@@ -22,10 +27,6 @@
  *     Sean Su <ssu@netscape.com>
  */
 
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by setup.rc
-//
 #define IDS_ERROR_DLL_LOAD              1
 #define IDS_ERROR_STRING_LOAD           2
 #define IDS_ERROR_STRING_NULL           4
@@ -35,7 +36,7 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_RESOURCE_VALUE        103
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/mozilla/xpinstall/wizard/windows/setup/setup.rc b/mozilla/xpinstall/wizard/windows/setup/setup.rc
index 95693a02c7b..2f41cabcac8 100644
--- a/mozilla/xpinstall/wizard/windows/setup/setup.rc
+++ b/mozilla/xpinstall/wizard/windows/setup/setup.rc
@@ -1,3 +1,6 @@
+//Microsoft Developer Studio generated resource script.
+//
+
 /* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * The contents of this file are subject to the Netscape Public License
@@ -22,8 +25,6 @@
  *     Sean Su <ssu@netscape.com>
  */
 
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -117,6 +118,15 @@ END
 #endif    // !_MAC
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+1                       ICON    DISCARDABLE     "setup.ico"
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table