diff --git a/mozilla/tools/tinderbox/post-mozilla-rel.pl b/mozilla/tools/tinderbox/post-mozilla-rel.pl
index a58f01c52b2..df57b4b5539 100755
--- a/mozilla/tools/tinderbox/post-mozilla-rel.pl
+++ b/mozilla/tools/tinderbox/post-mozilla-rel.pl
@@ -49,6 +49,44 @@ sub shorthost {
   return $host;
 }
 
+sub stagesymbols {
+  my $builddir = shift;
+  TinderUtils::run_shell_command "make -C $builddir deliver";
+}
+
+sub makefullsoft {
+  my $builddir = shift;
+  if (is_windows()) {
+    # need to convert the path in case we're using activestate perl
+    $builddir = `cygpath -u $builddir`;
+  }
+  chomp($builddir);
+  # should go in config
+  my $moforoot = "cltbld\@cvs.mozilla.org:/mofo"; 
+  my $fullsofttag = " ";
+  $fullsofttag = " -r $Settings::BuildTag"
+        unless not defined($Settings::BuildTag) or $Settings::BuildTag eq '';
+  TinderUtils::run_shell_command "cd $builddir; cvs -d$moforoot co $fullsofttag -d fullsoft talkback/fullsoft";
+  TinderUtils::run_shell_command "$builddir/build/autoconf/make-makefile $builddir/fullsoft";
+  TinderUtils::run_shell_command "make -C $builddir/fullsoft";
+  TinderUtils::run_shell_command "make -C $builddir/fullsoft fullcircle-push";
+}
+
+sub processtalkback {
+  # first argument is whether to make a new talkback build on server
+  #                and upload debug symbols
+  # second argument is where we're building our tree
+  my $makefullsoft      = shift;
+  my $builddir      = shift;   
+  # put symbols in builddir/dist/buildid
+  stagesymbols($builddir); 
+  if ($makefullsoft) {
+    $ENV{FC_UPLOADSYMS} = 1;
+    makefullsoft($builddir);
+  }
+  
+}
+
 sub packit {
   my ($packaging_dir, $package_location, $url, $stagedir) = @_;
   my $status;
@@ -285,6 +323,8 @@ sub main {
     $cachebuild = 0;
   }
 
+  processtalkback($cachebuild && $Settings::shiptalkback, $objdir);
+
   $upload_directory = $package_location . "/" . $upload_directory;
 
   unless (packit($package_creation_path,$package_location,$url_path,$upload_directory)) {
@@ -296,7 +336,7 @@ sub main {
     return returnStatus("Pushing package $upload_directory failed", ("testfailed"));
   }
 
-  if (cacheit($c_hour,$c_yday,$Settings::build_hour,$last_build_day)) { 
+  if ($cachebuild) { 
     open BLAH, ">last-built"; 
     close BLAH;
     return reportRelease ("$url_path\/", "$datestamp");
diff --git a/mozilla/tools/tinderbox/tinder-defaults.pl b/mozilla/tools/tinderbox/tinder-defaults.pl
index 05bdeb63d0b..4f2b860ea24 100644
--- a/mozilla/tools/tinderbox/tinder-defaults.pl
+++ b/mozilla/tools/tinderbox/tinder-defaults.pl
@@ -143,6 +143,24 @@ $ShellOverride = '';
 # allow override of timezone value (for win32 POSIX::strftime)
 $Timezone = '';
 
+# Release build options
+$ReleaseBuild  = 1;
+$shiptalkback  = 1;
+$build_hour    = "8";
+$package_creation_path = "/xpinstall/packager";
+$ssh_version   = "1";
+$ssh_user      = "cltbld";
+$ssh_server    = "stage.mozilla.org";
+$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
+$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
+$tbox_ftp_path = $ftp_path;
+$tbox_url_path = $url_path;
+$milestone     = "trunk";
+$notify_list   = "leaf\@mozilla.org";
+$stub_installer = 1;
+$sea_installer = 1;
+$archive       = 0;
+
 # Reboot the OS at the end of build-and-test cycle. This is primarily
 # intended for Win9x, which can't last more than a few cycles before
 # locking up (and testing would be suspect even after a couple of cycles).