--- a/build/client.py-args
+++ b/build/client.py-args
@@ -1,1 +1,1 @@
---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print
+--hg-options='--time' --apply-patches --skip-comm --tinderbox-print

--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -1,9 +1,9 @@
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5

--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,9 +1,9 @@
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux

--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -1,9 +1,9 @@
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Avoid dependency on libstdc++ 4.5

--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,9 +1,9 @@
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux

--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -5,17 +5,17 @@
 if test -e "$topsrcdir/mail/config/version.txt"; then
   unset CC
   unset CXX
 fi
 
 . $topsrcdir/build/macosx/universal/mozconfig
 
 # Universal builds override the default of mail (bug 575283 comment 29)
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 

--- a/mail/config/mozconfigs/macosx32/debug
+++ b/mail/config/mozconfigs/macosx32/debug
@@ -1,10 +1,10 @@
 . $topsrcdir/build/macosx/mozconfig.leopard
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-calendar
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j12"
 

--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -1,11 +1,11 @@
 . $topsrcdir/build/macosx/mozconfig.common
 
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-calendar
 
 # Enable parallel compiling
 mk_add_options MOZ_MAKE_FLAGS="-j12"
 

--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -1,11 +1,11 @@
 . "$topsrcdir/build/mozconfig.common"
 
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
@@ -16,16 +16,22 @@ export MOZ_DEBUG_SYMBOLS=1
 export DISABLE_LIGHTNING_INSTALL=1
 
 if test -n "${_PYMAKE}"; then
   mk_add_options MOZ_MAKE_FLAGS=-j4
 else
   mk_add_options MOZ_MAKE_FLAGS=-j1
 fi
 
+if test -n "$VC8"; then
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+else
+. $topsrcdir/build/win32/mozconfig.vs2010
+fi
+
 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
   . $topsrcdir/build/win32/mozconfig.vs2010-win64
 else
   . $topsrcdir/build/win32/mozconfig.vs2010
 fi
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$(cat $topsrcdir/build/client.py-args)"

--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,11 +1,11 @@
 . "$topsrcdir/build/mozconfig.common"
 
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # For NSS symbols