diff --git a/mozilla/webtools/tinderbox/bustagestats.cgi b/mozilla/webtools/tinderbox/bustagestats.cgi
index c12ac1225d8..8be04254bf6 100755
--- a/mozilla/webtools/tinderbox/bustagestats.cgi
+++ b/mozilla/webtools/tinderbox/bustagestats.cgi
@@ -63,7 +63,7 @@ if (defined $tree && defined $start && defined $end) {
             while (<IN>) {
                 chomp;
                 my ($mailtime, $buildtime, $buildname, $errorparser,
-                    $buildstatus, $logfile, $binaryname) = 
+                    $buildstatus, $logfile, $binaryurl) = 
                         split( /\|/ );
                 if ($buildtime >= $first && $buildtime <= $last) {
                     if (!defined $stats{$buildname}) {
diff --git a/mozilla/webtools/tinderbox/processbuild.pl b/mozilla/webtools/tinderbox/processbuild.pl
index 9f902614462..0f5a6c725e3 100755
--- a/mozilla/webtools/tinderbox/processbuild.pl
+++ b/mozilla/webtools/tinderbox/processbuild.pl
@@ -190,7 +190,7 @@ sub write_build_data {
   $process_time = time;
   open BUILDDATA, ">>$tbx->{tree}/build.dat" 
     or die "can't open $! for writing";
-  print BUILDDATA "$process_time|$tbx->{builddate}|$tbx->{build}|$tbx->{errorparser}|$tbx->{status}|$tbx->{logfile}|$tbx->{binaryname}\n";
+  print BUILDDATA "$process_time|$tbx->{builddate}|$tbx->{build}|$tbx->{errorparser}|$tbx->{status}|$tbx->{logfile}|$tbx->{binaryurl}\n";
   close BUILDDATA;
 }
 
@@ -210,7 +210,6 @@ sub compress_log_file {
   open ZIPLOG, "| $gzip -c > $tbx->{tree}/$tbx->{logfile}"
     or die "can't open $! for writing";
   my $inBinary = 0;
-  my $hasBinary = ($tbx->{binaryname} ne '');
   while (<LOG2>) {
     unless ($inBinary) {
       print ZIPLOG $_;
@@ -224,16 +223,4 @@ sub compress_log_file {
   }
   close ZIPLOG;
   close LOG2;
-
-  # If a uuencoded binary is part of the build, unpack it.
-  #
-  if ($hasBinary) {
-    $bin_dir = "$tbx->{tree}/bin/$tbx->{builddate}/$tbx->{build}";
-    $bin_dir =~ s/ //g;
-
-    system("mkdir -m 0777 -p $bin_dir");
-
-    # LTNOTE: I'm not sure this is cross platform.
-    system("/tools/ns/bin/uudecode --output-file=$bin_dir/$tbx->{binaryname} < $ARGV[0]");
-  }
 }
diff --git a/mozilla/webtools/tinderbox/showbuilds.cgi b/mozilla/webtools/tinderbox/showbuilds.cgi
index 184812c2772..e9c22137b09 100755
--- a/mozilla/webtools/tinderbox/showbuilds.cgi
+++ b/mozilla/webtools/tinderbox/showbuilds.cgi
@@ -196,6 +196,10 @@ sub print_page_head {
                 <td align=center><TT>C</TT></td>
                 <td>= Show Checkins</td>
               </tr>
+              <tr>
+                <td align=center><TT>D</TT></td>
+                <td>= Download Build</td>
+              </tr>
               <tr>
               <td align=center>
               <img src="$images{star}"></td><td>= Show Log comments
@@ -329,7 +333,7 @@ BEGIN {
       print "<A HREF='$logurl'"
            ." onclick=\"return log(event,$build_index,'$logfile');\">"
            ."L</a>";
-      
+ 
       # What Changed
       #
       # Only add the "C" link if there have been changes since the last build.
@@ -344,6 +348,14 @@ BEGIN {
           print "C</a>";
         }
       }
+
+      # Binary URL
+      #
+      # Only add the "D" link if there is a url to a downloadable binary
+      if( $br->{binaryurl} ){
+          $binaryurl = $br->{binaryurl};
+          print" <A HREF=$binaryurl>D</A>";
+      }
       
       # Leak/Bloat
       if (defined $td->{bloaty}{$logfile}) {
diff --git a/mozilla/webtools/tinderbox/tbglobals.pl b/mozilla/webtools/tinderbox/tbglobals.pl
index 8127b94c5ef..f591ca2806e 100755
--- a/mozilla/webtools/tinderbox/tbglobals.pl
+++ b/mozilla/webtools/tinderbox/tbglobals.pl
@@ -261,7 +261,7 @@ sub tb_find_build_record {
   chomp($log_entry);
   # Skip the logfile in the parse since it is already known.
   my ($mailtime, $buildtime, $buildname, $errorparser,
-      $buildstatus, $binaryname) = (split /\|/, $log_entry)[0..4,6];
+      $buildstatus, $binaryurl) = (split /\|/, $log_entry)[0..4,6];
 
   $buildrec = {    
     mailtime    => $mailtime,
@@ -270,7 +270,7 @@ sub tb_find_build_record {
     errorparser => $errorparser,
     buildstatus => $buildstatus,
     logfile     => $logfile,
-    binaryname  => $binaryname,
+    binaryurl   => $binaryurl,
     td          => undef
   };
   return $buildrec;
@@ -308,7 +308,7 @@ sub load_buildlog {
   while( $_ = $bw->readline ) {
     chomp;
     my ($mailtime, $buildtime, $buildname,
-     $errorparser, $buildstatus, $logfile, $binaryname) = split /\|/;
+     $errorparser, $buildstatus, $logfile, $binaryurl) = split /\|/;
     
     # Ignore stuff in the future.
     next if $buildtime > $maxdate;
@@ -331,7 +331,7 @@ sub load_buildlog {
                       errorparser => $errorparser,
                       buildstatus => $buildstatus,
                       logfile     => $logfile,
-                      binaryname  => $binaryname,
+                      binaryurl   => $binaryurl,
                       td          => $treedata
                      };
       push @{$build_list}, $buildrec;