Index: /trunk/Makefile.kmk
===================================================================
--- /trunk/Makefile.kmk	(revision 45360)
+++ /trunk/Makefile.kmk	(revision 45361)
@@ -161,5 +161,6 @@
 # from the build server), and it's not really worth the effort of dragging in
 # this tool only if absolutely needed.
-TOOL += ZIP
+## @todo Hack to get at TOOL_ZIP_UNPACK; see if this can be integrated somehow...
+include $(KBUILD_PATH)/tools/ZIP.kmk
 
 #