diff --git a/allmakefiles.sh b/allmakefiles.sh
index 3a9daa42530..d8a8c1f3552 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -1210,8 +1210,13 @@ MAKEFILES_libbz2="
 MAKEFILES_libmar="
     modules/libmar/Makefile
     modules/libmar/src/Makefile
+    modules/libmar/tool/Makefile
 "
 
+if test -n "$MOZ_UPDATE_PACKAGING"; then
+    MAKEFILES_update_packaging="tools/update-packaging/Makefile"
+fi
+
 if [ ! "$SYSTEM_PNG" ]; then
     MAKEFILES_libimg="$MAKEFILES_libimg modules/libimg/png/Makefile"
 fi
@@ -1617,6 +1622,7 @@ $MAKEFILES_xpfe
 $MAKEFILES_zlib
 $MAKEFILES_libbz2
 $MAKEFILES_libmar
+$MAKEFILES_update_packaging
 "
 
 if test -n "$MOZ_PSM"; then
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index c3bd0d6b0f6..984248446f6 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -124,6 +124,7 @@ JS_ULTRASPARC_OPTS = @JS_ULTRASPARC_OPTS@
 MOZ_ENABLE_POSTSCRIPT = @MOZ_ENABLE_POSTSCRIPT@
 MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
+MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_ACTIVEX_SCRIPTING_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
 XPC_IDISPATCH_SUPPORT = @MOZ_ACTIVEX_SCRIPTING_SUPPORT@
diff --git a/configure.in b/configure.in
index 4fdc46af50f..189406eff13 100644
--- a/configure.in
+++ b/configure.in
@@ -4883,6 +4883,14 @@ case "$target_os" in
 esac
 AC_SUBST(MOZ_UPDATER)
 
+# tools/update-packaging is not checked out by default.
+MOZ_ARG_ENABLE_BOOL(update-packaging,
+[  --enable-update-packaging
+                           Enable tools/update-packaging],
+    MOZ_UPDATE_PACKAGING=1,
+    MOZ_UPDATE_PACKAGING= )
+AC_SUBST(MOZ_UPDATE_PACKAGING)
+
 dnl ========================================================
 dnl ActiveX
 dnl ========================================================