diff --git a/xpinstall/res/locale/en-US/xpinstall.properties b/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
similarity index 100%
rename from xpinstall/res/locale/en-US/xpinstall.properties
rename to toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 1659cbed0c6a..9fbbf86219ab 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -46,6 +46,7 @@
 + locale/@AB_CD@/global/viewSource.properties           (@AB_CD@/chrome/global/viewSource.properties)
 + locale/@AB_CD@/global/wizard.properties               (@AB_CD@/chrome/global/wizard.properties)
   locale/@AB_CD@/global/history/history.properties      (@AB_CD@/chrome/global/history/history.properties)
+  locale/@AB_CD@/global/xpinstall/xpinstall.properties  (@AB_CD@/chrome/global/xpinstall/xpinstall.properties)
 * locale/@AB_CD@/global-region/contents.rdf             (generic/chrome/global-region/contents.rdf)
 + locale/@AB_CD@/global-region/region.dtd               (@AB_CD@/chrome/global-region/region.dtd)
 + locale/@AB_CD@/global-region/region.properties        (@AB_CD@/chrome/global-region/region.properties)
diff --git a/xpinstall/Makefile.in b/xpinstall/Makefile.in
index f82bd8ac83a8..bf335ec293fe 100644
--- a/xpinstall/Makefile.in
+++ b/xpinstall/Makefile.in
@@ -49,7 +49,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= xpinstall
 DIRS		= public src stub cleanup
 
-ifndef MOZ_PHOENIX
+ifndef MOZ_XUL_APP
 DIRS		+= res
 endif
 
diff --git a/xpinstall/res/jar.mn b/xpinstall/res/jar.mn
index 9b9b87304f66..fa6c878eaf01 100644
--- a/xpinstall/res/jar.mn
+++ b/xpinstall/res/jar.mn
@@ -5,6 +5,6 @@ comm.jar:
     content/communicator/xpinstall/institems.js (content/institems.js)
 
 en-US.jar:
-    locale/en-US/communicator/xpinstall/xpinstall.properties (locale/en-US/xpinstall.properties)
+    locale/en-US/global/xpinstall/xpinstall.properties (/toolkit/locales/en-US/chrome/global/xpinstall.properties)
     locale/en-US/communicator/xpinstall/xpistatus.dtd (locale/en-US/xpistatus.dtd)
     locale/en-US/communicator/xpinstall/institems.dtd (locale/en-US/institems.dtd)