diff --git a/tools/tinderbox/post-mozilla-rel.pl b/tools/tinderbox/post-mozilla-rel.pl
index fa1473859e9..a54e2a6aafd 100755
--- a/tools/tinderbox/post-mozilla-rel.pl
+++ b/tools/tinderbox/post-mozilla-rel.pl
@@ -70,6 +70,9 @@ sub makefullsoft {
   TinderUtils::run_shell_command "cd $builddir/fullsoft; $builddir/build/autoconf/make-makefile";
   TinderUtils::run_shell_command "make -C $builddir/fullsoft";
   TinderUtils::run_shell_command "make -C $builddir/fullsoft fullcircle-push";
+  if (is_mac()) {
+    TinderUtils::run_shell_command "make -C $builddir/$Settings::mac_bundle_path";
+  }
 }
 
 sub processtalkback {
@@ -148,7 +151,9 @@ sub packit {
     if (is_windows()) {
       TinderUtils::run_shell_command "cp $package_location/../*.zip $stagedir/";
     } elsif (is_mac()) {
-      TinderUtils::run_shell_command "cp $package_location/../dist/*.dmg.gz $stagedir/";
+      system("mkdir -p $package_location");
+      system("mkdir -p $stagedir");
+      TinderUtils::run_shell_command "cp $package_location/../*.dmg.gz $stagedir/";
     } else {
       TinderUtils::run_shell_command "cp $package_location/../dist/*.tar.gz $stagedir/";
     }
@@ -280,7 +285,7 @@ sub main {
   # need to modify the settings from tinder-config.pl
   my $package_creation_path = $objdir . $Settings::package_creation_path;
   my $package_location;
-  if (is_windows()) {
+  if (is_windows() || is_mac()) {
     $package_location = $objdir . "/dist/install";
   } else {
     $package_location = $objdir . "/installer";
diff --git a/tools/tinderbox/tinder-defaults.pl b/tools/tinderbox/tinder-defaults.pl
index 1de7a7d053b..e0afbaf3527 100644
--- a/tools/tinderbox/tinder-defaults.pl
+++ b/tools/tinderbox/tinder-defaults.pl
@@ -149,6 +149,7 @@ $ReleaseBuild  = 1;
 $shiptalkback  = 1;
 $build_hour    = "8";
 $package_creation_path = "/xpinstall/packager";
+# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
 $ssh_version   = "1";
 $ssh_user      = "cltbld";
 $ssh_server    = "stage.mozilla.org";