--- a/thunderbird/linux/mozconfig
+++ b/thunderbird/linux/mozconfig
@@ -1,11 +1,11 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-optimize
-ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-shared
 ac_add_options --enable-static
 
 CC=/tools/gcc-4.1.1/bin/gcc

--- a/thunderbird/macosx/mozconfig
+++ b/thunderbird/macosx/mozconfig
@@ -1,17 +1,17 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
 . $topsrcdir/mozilla/build/macosx/universal/mozconfig
 else
 . $topsrcdir/build/macosx/universal/mozconfig
 fi
 ac_add_app_options ppc --enable-prebinding
 
 ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-codesighs
 ac_add_options --disable-shared
 ac_add_options --enable-static
 

--- a/thunderbird/win32/mozconfig
+++ b/thunderbird/win32/mozconfig
@@ -1,10 +1,10 @@
 ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
 ac_add_options --disable-tests
 ac_add_options --disable-shared
 ac_add_options --enable-static
 
 export MOZ_DEBUG_SYMBOLS=1