diff --git a/mozilla/tools/update-packaging/Makefile.in b/mozilla/tools/update-packaging/Makefile.in
index 8410893759d..abad2902bac 100644
--- a/mozilla/tools/update-packaging/Makefile.in
+++ b/mozilla/tools/update-packaging/Makefile.in
@@ -48,6 +48,6 @@ STAGE_DIR	= $(DIST)/update
 
 full-update::
 	mkdir -p $(STAGE_DIR)
-	MAR=$(PWD)/$(DIST)/host/bin/mar $(srcdir)/make_full_update.sh $(STAGE_DIR)/update.mar $(DIST)/bin
+	MAR=$(DIST)/host/bin/mar $(srcdir)/make_full_update.sh $(STAGE_DIR)/update.mar $(DIST)/bin
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/tools/update-packaging/make_full_update.sh b/mozilla/tools/update-packaging/make_full_update.sh
index de1df19e3e0..788ca56cd37 100755
--- a/mozilla/tools/update-packaging/make_full_update.sh
+++ b/mozilla/tools/update-packaging/make_full_update.sh
@@ -76,7 +76,7 @@ done
 
 $BZIP2 -z9 "$manifest" && mv -f "$manifest.bz2" "$manifest"
 
-(cd "$workdir" && eval "$MAR -c output.mar $targetfiles")
+eval "$MAR -C \"$workdir\" -c output.mar $targetfiles"
 mv -f "$workdir/output.mar" "$archive"
 
 # cleanup
diff --git a/mozilla/tools/update-packaging/make_incremental_update.sh b/mozilla/tools/update-packaging/make_incremental_update.sh
index 307619f639f..6060dd4f172 100755
--- a/mozilla/tools/update-packaging/make_incremental_update.sh
+++ b/mozilla/tools/update-packaging/make_incremental_update.sh
@@ -113,7 +113,7 @@ done
 
 $BZIP2 -z9 "$manifest" && mv -f "$manifest.bz2" "$manifest"
 
-(cd "$workdir" && eval "$MAR -c output.mar $archivefiles")
+eval "$MAR -C \"$workdir\" -c output.mar $archivefiles"
 mv -f "$workdir/output.mar" "$archive"
 
 # cleanup