diff --git a/mozilla/config/cvsco-fast-update.pl b/mozilla/config/cvsco-fast-update.pl
index 508a837b551..db3e4831ce9 100755
--- a/mozilla/config/cvsco-fast-update.pl
+++ b/mozilla/config/cvsco-fast-update.pl
@@ -67,11 +67,10 @@ foreach my $mod (@modules) {
   #print "system \"$cmd\"\n";
   $status |= system $cmd;
 }
-foreach my $d (@dirs) {
-  my $cmd = "config/fast-update.pl -r $branch -d $d -m all" . ($dirlocal ? " -l" : "");
-  #print "system \"$cmd\"\n";
-  $status |= system $cmd;
-}
+my $dirlist = join(' -d ', @dirs);
+my $cmd = "config/fast-update.pl -r $branch -d $dirlist -m all" . ($dirlocal ? " -l" : "");
+#print "system \"$cmd\"\n";
+$status |= system $cmd;
 
 exit $status;
 
diff --git a/mozilla/config/fast-update.pl b/mozilla/config/fast-update.pl
index a6e736cfdb8..0e5b795d102 100755
--- a/mozilla/config/fast-update.pl
+++ b/mozilla/config/fast-update.pl
@@ -24,15 +24,16 @@ my $module="SeaMonkeyAll";
 my $maxdirs=5;
 my $rootdir = "";
 my $hours = 0;
-my $dir = '';
+my @dirs = ();
 my $dirlocal = 0;
 
-&GetOptions('d=s' => \$dir, 'h=s' => \$hours, 'm=s' => \$module, 'r=s' => \$branch, 'l' => \$dirlocal);
+&GetOptions('d=s@' => \@dirs, 'h=s' => \$hours, 'm=s' => \$module, 'r=s' => \$branch, 'l' => \$dirlocal);
 
-#print "dir = ($dir), hours = ($hours), module = ($module), branch = ($branch), dirlocal = ($dirlocal)\n";
-if ($dir) {
-  chdir '..';
-  chdir $dir;
+#print "dirs = (@dirs), hours = ($hours), module = ($module), branch = ($branch), dirlocal = ($dirlocal)\n";
+if (scalar(@dirs) > 0) {
+  # put .fast-update in the first directory listed
+  $filename = "$dirs[0]/$filename";
+  $filename =~ s#mozilla/*##;
 }
 
 if (!$hours) {
@@ -98,8 +99,10 @@ if ($branch) {
 
 my $url = "http://bonsai.mozilla.org/cvsquery.cgi?module=${module}&branch=${branch}&branchtype=match&sortby=File&date=hours&hours=${hours}&cvsroot=%2Fcvsroot";
 
-my $esc_dir = escape($dir);
-if ($dir) {
+my $dir_string = "";
+if (scalar(@dirs) > 0) {
+  $dir_string = join(' ', @dirs);
+  my $esc_dir = escape($dir_string);
   $url .= "&dir=$esc_dir";
 }
 if ($dirlocal) {
@@ -215,11 +218,18 @@ else {
 close CHECKINS;
 if ($status == 0) {
   set_last_update_time($filename, $start_time);
-  print "successfully updated $module/$dir\n";
+  print "successfully updated ";
 }
 else {
-  print "error while updating $module/$dir\n";
+  print "error while updating ";
 }
+if ($module ne "all") {
+  print "$module/";
+}
+if (scalar(@dirs) > 0) {
+  print $dir_string;
+}
+print "\n";
 
 exit $status;