Index: /trunk/Makefile.kmk
===================================================================
--- /trunk/Makefile.kmk	(revision 23655)
+++ /trunk/Makefile.kmk	(revision 23656)
@@ -290,5 +290,5 @@
 
 ifdef VBOX_WITH_EFIFW_FROM_BUILD_SERVER
-include $(KBUILD_PATH)/tools/TAR.kmk
+include $(KBUILD_PATH)/tools/ZIP.kmk
 
 VBOX_FW_BASE=$(PATH_TARGET)/EfiFw
@@ -300,14 +300,14 @@
 buildserver-efifw_SOURCES = \
       $(VBOX_FW_BASE)/FV/VBOX.fd=>vboxefi.fv
-buildserver-efifw_CLEANS = $(VBOX_FW_BASE)
-
-$$(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
-	$(RM) -f $(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2.tmp
-	$(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename $(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2.tmp
-	$(MV) $(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2.tmp $(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2
-
-$$(VBOX_FW_BASE)/FV/VBOX.fd: $(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2
-	bzip2 -d $(VBOX_FW_BASE)/VBoxEfiFirmware.tar.bz2
-	$(TOOL_TAR_UNPACK) xf $(VBOX_FW_BASE)/VBoxEfiFirmware.tar -C $(VBOX_FW_BASE)
+buildserver-efifw_CLEANS = $(INST_BIN)/vboxefi.fv
+
+$$(VBOX_FW_BASE)/VBoxEfiFirmware.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
+	$(RM) -f $(VBOX_FW_BASE)/VBoxEfiFirmware.zip.tmp
+	$(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename $(VBOX_FW_BASE)/VBoxEfiFirmware.zip.tmp
+	$(MV) $(VBOX_FW_BASE)/VBoxEfiFirmware.zip.tmp $(VBOX_FW_BASE)/VBoxEfiFirmware.zip
+
+$$(VBOX_FW_BASE)/FV/VBOX.fd: $(VBOX_FW_BASE)/VBoxEfiFirmware.zip
+	$(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(VBOX_FW_BASE)
+
 endif