--- virtualbox-4.2.18.ebuild.old	2013-10-02 18:09:04.600075085 -0500
+++ virtualbox-4.2.18.ebuild	2013-10-03 10:50:26.925602815 -0500
@@ -20,7 +20,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk vboxwebsrv vnc"
+IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk tools vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -69,6 +69,7 @@
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	!headless? ( x11-libs/libXinerama )
 	pulseaudio? ( media-sound/pulseaudio )
+	tools? ( sys-libs/zlib[static-libs] )
 	vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )
 	${PYTHON_DEPS}"
 PDEPEND="additions? ( ~app-emulation/virtualbox-additions-${PV} )
@@ -180,6 +181,11 @@
 			-i "${S}"/src/apps/adpctl/VBoxNetAdpCtl.cpp \
 			|| die
 	fi
+
+	use tools && \
+		sed	-e '/^VBOX_WITH_VDITOOL =/ s/$/ 1/' \
+			-e '/^VBOX_WITH_VBOX_IMG =/ s/$/ 1/' \
+			-i Config.kmk
 }
 
 src_configure() {
@@ -266,6 +272,8 @@
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
 
+	use tools && dobin ../obj/vbox-img/vbox-img ../obj/vditool/vditool
+
 	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,ExtPackHelperApp} *so *r0 *gc ; do
 		doins $each
 		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}