diff --git a/mozilla/xpinstall/Makefile.in b/mozilla/xpinstall/Makefile.in
index dc6f30ae34b..bf04042ebe0 100644
--- a/mozilla/xpinstall/Makefile.in
+++ b/mozilla/xpinstall/Makefile.in
@@ -44,6 +44,16 @@ endif
 ifeq ($(OS_ARCH),OS2)
 DIRS		+= wizard/os2
 endif
+
+packages:
+	make -C packager
+
+installer: packages
+ifeq ($(OS_ARCH),Linux)
+	make -C packager/unix
+endif
+ifeq ($(OS_ARCH),WINNT)
+	make -C wizard/windows/builder
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/xpinstall/packager/Makefile.in b/mozilla/xpinstall/packager/Makefile.in
index 9cf0483d8fa..f5066078199 100644
--- a/mozilla/xpinstall/packager/Makefile.in
+++ b/mozilla/xpinstall/packager/Makefile.in
@@ -38,8 +38,10 @@ MOZ_PKG_FORMAT	= DMG
 else
 ifeq (,$(filter-out OS2 WINNT, $(OS_ARCH)))
 MOZ_PKG_FORMAT  = ZIP
+INSTALLER_DIR   = windows
 else
 MOZ_PKG_FORMAT	= TGZ
+INSTALLER_DIR   = unix
 endif
 endif
 endif # MOZ_PKG_FORMAT
@@ -256,3 +258,7 @@ endif
 	@echo "Done creating $(PACKAGE)."
 endif
 
+installer:
+ifdef INSTALLER_DIR
+	make -C $(INSTALLER_DIR) installer
+endif
diff --git a/mozilla/xpinstall/packager/unix/Makefile.in b/mozilla/xpinstall/packager/unix/Makefile.in
new file mode 100644
index 00000000000..f6cb949f07b
--- /dev/null
+++ b/mozilla/xpinstall/packager/unix/Makefile.in
@@ -0,0 +1,36 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#      leaf nunes <leaf@mozilla.org>
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpinstall
+
+installer:
+	$(PERL) $(srcdir)/deliver.pl -o $(DEPTH) -s $(topsrcdir)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/xpinstall/wizard/windows/builder/Makefile.in b/mozilla/xpinstall/wizard/windows/builder/Makefile.in
new file mode 100644
index 00000000000..2f4fdc816df
--- /dev/null
+++ b/mozilla/xpinstall/wizard/windows/builder/Makefile.in
@@ -0,0 +1,36 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#      leaf nunes <leaf@mozilla.org>
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpinstall
+
+installer:
+	$(PERL) build.pl
+
+include $(topsrcdir)/config/rules.mk
+