--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -53,35 +53,38 @@ MOZ_NONLOCALIZED_PKG_LIST = \
 	mail \
 	newsblog \
 	offline \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+ifdef MOZ_ENABLE_GNOME_COMPONENT
+DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
+endif
+
+ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+DEFINES += -DMOZ_GTK2=1
+endif
+
+ifdef _MSC_VER
+DEFINES += -D_MSC_VER=$(_MSC_VER)
+endif
 
 ifeq ($(MOZ_CHROME_FILE_FORMAT), jar)
 DEFINES += -DJAREXT=.jar
 else
 DEFINES += -DJAREXT=
 endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
-ifdef MOZ_ENABLE_GNOME_COMPONENT
-DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
-endif
-
-ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
-DEFINES += -DMOZ_GTK2=1
-endif
-
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -94,37 +97,27 @@ endif
 ifndef MOZ_ENABLE_LIBXUL
 $(error you need an "--enable-libxul" build to package a build)
 endif
 
 NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
 
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
-ifdef MOZ_PKG_PRETTYNAMES
-libs::
-	$(MAKE) -C $(DEPTH)/mail/locales langpack-$(AB_CD)
-
-UPLOAD_EXTRA_FILES += $(LANGPACK)
-else
-libs::
-	$(MAKE) -C $(DEPTH)/mail/locales langpack-$(AB_CD) PKG_LANGPACK_PATH=
-
-UPLOAD_EXTRA_FILES += $(PKG_LANGPACK_BASENAME).xpi
-endif
-
-
 ifeq (Darwin, $(OS_ARCH))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 BINPATH = bin
 endif
 DEFINES += -DBINPATH=$(BINPATH)
 
+libs::
+	$(MAKE) -C $(DEPTH)/mail/locales langpack
+
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS = 
 else
 PKGCOMP_FIND_OPTS = -L
 endif
 ifeq (Darwin, $(OS_ARCH))
 FINDPATH = $(_APPNAME)/Contents/MacOS
 else

--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -43,20 +43,30 @@
 #ifdef MOZ_IPC
 @BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #endif
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif
 #ifdef XP_WIN32
 #ifndef MOZ_MEMORY
+#if _MSC_VER == 1400
 @BINPATH@/Microsoft.VC80.CRT.manifest
 @BINPATH@/msvcm80.dll
 @BINPATH@/msvcp80.dll
 @BINPATH@/msvcr80.dll
+#elif _MSC_VER == 1500
+@BINPATH@/Microsoft.VC90.CRT.manifest
+@BINPATH@/msvcm90.dll
+@BINPATH@/msvcp90.dll
+@BINPATH@/msvcr90.dll
+#elif _MSC_VER == 1600
+@BINPATH@/msvcp100.dll
+@BINPATH@/msvcr100.dll
+#endif
 #else
 @BINPATH@/mozcrt19.dll
 @BINPATH@/mozcpp19.dll
 #endif
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL

--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -222,25 +222,14 @@ endif
 # Move the windows installer
 ifeq (WINNT, $(OS_ARCH))
 	mv "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" \
 	   "$(UPLOAD_DIR)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 endif
 # Set the permissions that the folders will have in ftp once uploaded
 	chmod -vR 775 $(UPLOAD_DIR)
 
-l10n-upload-%: AB_CD=$*
-l10n-upload-%:
-	$(PYTHON) $(MOZILLA_SRCDIR)/build/upload.py --base-path $(DIST) "$(DIST)/$(PACKAGE)" $(DIST)/$(LANGPACK)
-ifdef MOZ_MAKE_COMPLETE_MAR
-	$(PYTHON) $(MOZILLA_SRCDIR)/build/upload.py --base-path $(DIST) $(DIST)/$(COMPLETE_MAR) $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR)))
-endif
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
-	$(PYTHON) $(MOZILLA_SRCDIR)/build/upload.py --base-path $(DIST) "$(INSTALLER_PACKAGE)"
-endif
-
-
 merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
 	MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
 endif
 	@echo