diff --git a/mozilla/tools/tinderbox-configs/lightning/linux/CLOBBER b/mozilla/tools/tinderbox-configs/lightning/linux/CLOBBER
index 2dabacc1bb7..891e75e68b5 100644
--- a/mozilla/tools/tinderbox-configs/lightning/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/lightning/linux/CLOBBER
@@ -8,3 +8,4 @@
 2007-09-28 08:59 UTC - switch to release mode for 0.7
 2007-10-25 15:43 UTC - switch to develop mode for 0.8
 2008-03-04 08:59 UTC - switch to release mode for 0.8
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
index 720586ae358..92a89e4d9b0 100644
--- a/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/linux/tinder-config.pl
@@ -166,8 +166,8 @@ $BuildNameExtra = 'Lt-Release';
 $BuildTree  = 'Sunbird-Mozilla1.8';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/lightning/macosx/CLOBBER b/mozilla/tools/tinderbox-configs/lightning/macosx/CLOBBER
index ecb885eb06e..3c622073bc7 100644
--- a/mozilla/tools/tinderbox-configs/lightning/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/lightning/macosx/CLOBBER
@@ -11,3 +11,4 @@
 2007-10-25 15:43 UTC - switch to develop mode for 0.8
 2008-01-23 10:00 UTC - Clobber just to make sure universal static builds work
 2008-03-04 08:59 UTC - switch to release mode for 0.8
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
index f0bb5233764..77fa24c31ca 100755
--- a/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/macosx/tinder-config.pl
@@ -165,8 +165,8 @@ $BuildNameExtra = 'Lt-Release';
 $BuildTree  = 'Sunbird-Mozilla1.8';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/CLOBBER b/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/CLOBBER
index 8d1c8b69c3f..c60ebcc674c 100644
--- a/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/CLOBBER
@@ -1 +1 @@
- 
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/tinder-config.pl
index 17bd1e1bd94..33a4d4f9dc4 100644
--- a/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/solaris-sparc/tinder-config.pl
@@ -213,8 +213,8 @@ $BuildNameExtra = 'Lightning-1.8-Testrelease';
 $BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/lightning/solaris-x86/CLOBBER b/mozilla/tools/tinderbox-configs/lightning/solaris-x86/CLOBBER
index 8d1c8b69c3f..c60ebcc674c 100644
--- a/mozilla/tools/tinderbox-configs/lightning/solaris-x86/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/lightning/solaris-x86/CLOBBER
@@ -1 +1 @@
- 
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/lightning/solaris-x86/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/solaris-x86/tinder-config.pl
index 088efe04588..e7c37e01df3 100644
--- a/mozilla/tools/tinderbox-configs/lightning/solaris-x86/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/solaris-x86/tinder-config.pl
@@ -215,8 +215,8 @@ $BuildNameExtra = 'Lightning-1.8-Testrelease';
 $BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/lightning/win32/CLOBBER b/mozilla/tools/tinderbox-configs/lightning/win32/CLOBBER
index d6aee8cecfb..a380d434c32 100644
--- a/mozilla/tools/tinderbox-configs/lightning/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/lightning/win32/CLOBBER
@@ -7,3 +7,4 @@
 2007-09-28 08:59 UTC - switch to release mode for 0.7
 2007-10-25 15:43 UTC - switch to develop mode for 0.8
 2008-03-04 08:59 UTC - switch to release mode for 0.8
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
index bf1902a5981..2bce1e2e9dc 100644
--- a/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/lightning/win32/tinder-config.pl
@@ -160,8 +160,8 @@ $BuildNameExtra = 'Lt-Release';
 $BuildTree  = 'Sunbird-Mozilla1.8';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER b/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
index 0c56d8cfc9c..1e79c6ea825 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/CLOBBER
@@ -7,3 +7,4 @@
 2007-09-28 08:58 UTC - switch to release mode for 0.7
 2007-10-25 15:43 UTC - switch to develop mode for 0.8
 2008-03-04 08:59 UTC - switch to release mode for 0.8
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
index f32626f7025..350f24e14cc 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/mozconfig
@@ -24,9 +24,9 @@ ac_add_options --enable-static
 ac_add_options --disable-shared
 
 # for nightly mode
-#ac_add_options --enable-update-channel="nightly"
+ac_add_options --enable-update-channel="nightly"
 
 # for release mode
-ac_add_options --enable-update-channel="release"
-ac_add_options --enable-official-branding
+#ac_add_options --enable-update-channel="release"
+#ac_add_options --enable-official-branding
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl
index 408bfdf9d58..0291be58a75 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl
@@ -191,8 +191,8 @@ $BuildLocalesArgs = "ZIP_IN=/builds/tinderbox/Sb-Branch/Linux_2.4.21-32.0.1.EL_D
 $BuildTree  = 'Sunbird-Mozilla1.8';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER b/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER
index 491ea51c398..9b95d3c7c76 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/CLOBBER
@@ -9,3 +9,4 @@ Wed Jan 31 04:56:34 GMT 2007 - Orange. Exits on launch
 2007-09-28 08:58 UTC - switch to release mode for 0.7
 2007-10-25 15:43 UTC - switch to develop mode for 0.8
 2008-03-04 08:59 UTC - switch to release mode for 0.8
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
index 6e03d4fec96..f3eeabefb4b 100755
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/mozconfig
@@ -24,9 +24,9 @@ ac_add_app_options ppc --enable-prebinding
 ac_add_options --enable-default-toolkit=mac
 
 # for nightly mode
-#ac_add_options --enable-update-channel="nightly"
+ac_add_options --enable-update-channel="nightly"
 
 # for release mode
-ac_add_options --enable-update-channel="release"
-ac_add_options --enable-official-branding
+#ac_add_options --enable-update-channel="release"
+#ac_add_options --enable-official-branding
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl
index 8b83dccd92e..2611b56b38d 100755
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl
@@ -52,10 +52,10 @@ $BuildAdministrator = 'build@mozilla.org';
 # Tests
 $CleanProfile             = 1;
 #$ResetHomeDirForTests     = 1;
-#$ProductName              = 'Calendar';
-#$MacOSProductName         = 'Calendar';
-$ProductName              = 'Sunbird';
-$MacOSProductName         = 'Sunbird';
+$ProductName              = 'Calendar';
+$MacOSProductName         = 'Calendar';
+#$ProductName              = 'Sunbird';
+#$MacOSProductName         = 'Sunbird';
 $VendorName               = "";
 
 $RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
@@ -188,8 +188,8 @@ $BuildTree  = 'Sunbird-Mozilla1.8';
 #$BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/CLOBBER b/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/CLOBBER
index 8d1c8b69c3f..c60ebcc674c 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/CLOBBER
@@ -1 +1 @@
- 
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/mozconfig
index 9792495050e..2327e32ac72 100755
--- a/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/mozconfig
@@ -16,8 +16,14 @@ ac_add_options --disable-installer
 ac_add_options --enable-static
 ac_add_options --disable-shared
 
+# for nightly mode
+# no update for tinderboxes outside mozilla.org possible atm
+#ac_add_options --enable-update-channel="nightly"
+
 # for release mode
-ac_add_options --enable-official-branding
+# no update for tinderboxes outside mozilla.org possible atm
+#ac_add_options --enable-update-channel="release"
+#ac_add_options --enable-official-branding
 
 # custom settings
 #ac_add_options --enable-extensions=default,lightning,inspector
diff --git a/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/tinder-config.pl
index f7d02e66302..1b2c5614a04 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/solaris-sparc/tinder-config.pl
@@ -212,8 +212,8 @@ $BuildNameExtra = 'Sunbird-1.8-Testrelease';
 $BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/CLOBBER b/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/CLOBBER
index 8d1c8b69c3f..c60ebcc674c 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/CLOBBER
@@ -1 +1 @@
- 
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/mozconfig
index deabef71095..1fa1f64c8ff 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/mozconfig
@@ -24,6 +24,12 @@ ac_add_options --x-includes=$SYSBASE/usr/include/X11
 ac_add_options --x-libraries=$SYSBASE/usr/lib
 ac_add_options --x-libraries=$SYSBASE/usr/sfw/lib
 
+# for nightly mode
+# no update for tinderboxes outside mozilla.org possible atm
+#ac_add_options --enable-update-channel="nightly"
+
 # for release mode
-ac_add_options --enable-update-channel="release"
-ac_add_options --enable-official-branding
+# no update for tinderboxes outside mozilla.org possible atm
+#ac_add_options --enable-update-channel="release"
+#ac_add_options --enable-official-branding
+
diff --git a/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/tinder-config.pl
index ad9a847f155..037772dab6b 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/solaris-x86/tinder-config.pl
@@ -213,8 +213,8 @@ $BuildNameExtra = 'Sunbird-1.8-Testrelease';
 $BuildTree  = 'MozillaTest';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER b/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER
index 8668908c3be..aa1ce698d88 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/CLOBBER
@@ -8,3 +8,4 @@
 2007-09-28 08:58 UTC - switch to release mode for 0.7
 2007-10-25 15:43 UTC - switch to develop mode for 0.8
 2008-03-04 08:59 UTC - switch to release mode for 0.8
+2007-04-07 11:00 UTC - switch to develop mode for 0.9
diff --git a/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig b/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
index f387b907e1c..12aa28aa0d9 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/mozconfig
@@ -25,9 +25,9 @@ ac_add_options --enable-static
 ac_add_options --disable-shared
 
 # for nightly mode
-#ac_add_options --enable-update-channel="nightly"
+ac_add_options --enable-update-channel="nightly"
 
 # for release mode
-ac_add_options --enable-update-channel="release"
-ac_add_options --enable-official-branding
+#ac_add_options --enable-update-channel="release"
+#ac_add_options --enable-official-branding
 
diff --git a/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl
index 922e0e680c0..583bf48196f 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl
@@ -198,8 +198,8 @@ $BuildLocalesArgs = "ZIP_IN=/cygdrive/d/builds/tinderbox/Sunbird-Branch/WINNT_5.
 $BuildTree  = 'Sunbird-Mozilla1.8';
 
 #$BuildName = '';
-#$BuildTag = 'MOZILLA_1_8_BRANCH';
-$BuildTag = 'SUNBIRD_0_8_BRANCH';
+$BuildTag = 'MOZILLA_1_8_BRANCH';
+#$BuildTag = 'SUNBIRD_0_8_BRANCH';
 #$BuildConfigDir = 'mozilla/config';
 #$Topsrcdir = 'mozilla';