Index: /trunk/Makefile.kmk
===================================================================
--- /trunk/Makefile.kmk	(revision 45359)
+++ /trunk/Makefile.kmk	(revision 45360)
@@ -158,4 +158,9 @@
 
 
+# Below we might need TOOL_ZIP_UNPACK (for the additions/docs/efifw packages
+# from the build server), and it's not really worth the effort of dragging in
+# this tool only if absolutely needed.
+TOOL += ZIP
+
 #
 # For building the combined package, just get the additions .ISO
@@ -228,7 +233,4 @@
 		VirtualBox.chm UserManual.pdf \
 		$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf))
-
-## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
-include $(KBUILD_PATH)/tools/ZIP.kmk
 
 $$(buildserver-docs_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VirtualBox.chm $(PATH_TARGET)/UserManual.pdf \
@@ -278,7 +280,4 @@
    	$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
    ## @todo rainy day: cleanup the output directory (zip contains lots more)
-
-   ## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
-   include $(KBUILD_PATH)/tools/ZIP.kmk
 
    $$(buildserver-efifw_0_OUTDIR)/unpacked.ts \