Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 53980)
+++ /trunk/Config.kmk	(revision 53981)
@@ -1243,4 +1243,9 @@
  VBOX_GUI_USE_QGL=
 endif
+
+# Collection macro mainly for deciding whether VBoxDTrace needs shipping.
+VBOX_WITH_DTRACE := $(if-expr defined(VBOX_WITH_DTRACE_R0) || defined(VBOX_WITH_DTRACE_R0DRV) \
+	       	            || defined(VBOX_WITH_DTRACE_R3) || defined(VBOX_WITH_DTRACE_RC),1,)
+
 
 #
Index: /trunk/src/VBox/ExtPacks/Makefile.kmk
===================================================================
--- /trunk/src/VBox/ExtPacks/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/ExtPacks/Makefile.kmk	(revision 53981)
@@ -22,10 +22,5 @@
  include $(PATH_SUB_CURRENT)/Puel/Makefile.kmk
 endif
-if    defined(VBOX_WITH_EXTPACK_VBOXDTRACE) \
-   || defined(VBOX_WITH_DTRACE) \
-   || defined(VBOX_WITH_DTRACE_R3) \
-   || defined(VBOX_WITH_DTRACE_R0) \
-   || defined(VBOX_WITH_DTRACE_R0DRV) \
-   || defined(VBOX_WITH_DTRACE_RC)
+if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) || defined(VBOX_WITH_DTRACE)
  include $(PATH_SUB_CURRENT)/VBoxDTrace/Makefile.kmk
 endif
Index: /trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
===================================================================
--- /trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk	(revision 53981)
@@ -31,15 +31,17 @@
 
 
-#
-# The generic wrapper that selects native or extpack dtrace cmd and adds our
-# library path to the command line.
-#
-# Note! This is not installed as part of the extension pack, but always shipped
-#       with the base VBox installation.
-#
-PROGRAMS += VBoxDTrace
-VBoxDTrace_TEMPLATE := VBOXR3EXE
-VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
-VBoxDTrace_LIBS = $(LIB_RUNTIME)
+ifndef VBOX_ONLY_ADDITIONS
+ #
+ # The generic wrapper that selects native or extpack dtrace cmd and adds our
+ # library path to the command line.
+ #
+ # Note! This is not installed as part of the extension pack, but always shipped
+ #       with the base VBox installation.
+ #
+ PROGRAMS += VBoxDTrace
+ VBoxDTrace_TEMPLATE := VBOXR3EXE
+ VBoxDTrace_SOURCES := VBoxDTraceWrapper.cpp
+ VBoxDTrace_LIBS = $(LIB_RUNTIME)
+endif
 
 
Index: /trunk/src/VBox/Installer/darwin/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/darwin/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/Installer/darwin/Makefile.kmk	(revision 53981)
@@ -454,5 +454,6 @@
 	MacOS/VirtualBoxVM \
 	$(if $(VBOX_WITH_WEBSERVICES),MacOS/vboxwebsrv) \
-	MacOS/VirtualBox
+	MacOS/VirtualBox \
+	$(if $(VBOX_WITH_DTRACE),MacOS/VBoxDTrace,)
 
 VBOX_DI_VBAPP_UNIVERSAL_PROGS = \
@@ -880,4 +881,8 @@
 	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxAutostart \
 		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart "$$@"'
+ifdef VBOX_WITH_DTRACE
+	$(APPEND) -tn $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/VBoxDTrace \
+		'#!/bin/bash' 'exec /Applications/VirtualBox.app/Contents/MacOS/VBoxDTrace "$$@"'
+endif
 	@# Set the correct owners and file permissions.
 	sudo chmod 0755 $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin/*
Index: /trunk/src/VBox/Installer/freebsd/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/freebsd/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/Installer/freebsd/Makefile.kmk	(revision 53981)
@@ -110,5 +110,6 @@
 		VBoxTestOGL \
 		VBoxSharedCrOpenGL.so,) \
-	$(if $(VBOX_WITH_PYTHON),VBoxPython.so,)
+	$(if $(VBOX_WITH_PYTHON),VBoxPython.so,) \
+	$(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 # Do not remove relocation information of these binaries
@@ -141,5 +142,6 @@
 		VBoxManage \
 		VBoxSVC) \
-	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,)
+	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
+	$(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 # Qt4 GUI
@@ -314,4 +316,5 @@
 		-e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
 		-e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
+		$(if $(VBOX_WITH_DTRACE),,-e "/VBoxDTrace/d") \
 		--output $@ \
 		$<
Index: /trunk/src/VBox/Installer/freebsd/pkg_plist
===================================================================
--- /trunk/src/VBox/Installer/freebsd/pkg_plist	(revision 53980)
+++ /trunk/src/VBox/Installer/freebsd/pkg_plist	(revision 53981)
@@ -53,4 +53,5 @@
 bin/VBoxHeadless
 bin/VBoxSDL
+bin/VBoxDTrace
 bin/vboxwebsrv
 @mode 644
Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 53981)
@@ -173,4 +173,5 @@
 		ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNC.so \
 		ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
+	$(if $(VBOX_WITH_DTRACE),VBoxDTrace,)\
 	VBoxTunctl \
 	helpers/generate_service_file
Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 53981)
@@ -215,5 +215,6 @@
 	$(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
 	VBoxXPCOMIPCD \
-	$(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
+	$(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) \
+       $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 SOLARIS_DRIVER_BINS = \
@@ -309,5 +310,6 @@
 	$(if $(VBOX_WITH_HEADLESS),VBoxHeadless,) \
 	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
-	VBoxManage
+	VBoxManage \
+	$(if $(VBOX_WITH_DTRACE),VBoxDTrace,)
 
 SOLARIS_COMMON_EXES = \
Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 53980)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 53981)
@@ -633,4 +633,5 @@
 		-E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
 		-E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
+		-E 'VBOX_WITH_DTRACE=$(if $(VBOX_WITH_DTRACE),yes,no)' \
 		-E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
 		-E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
Index: /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi	(revision 53980)
+++ /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi	(revision 53981)
@@ -183,4 +183,8 @@
         <File Id="file_VBoxExtPackHelperApp.exe" Name="VBoxExtPackHelperApp.exe"
               Source="$(env.PATH_OUT)\bin\VBoxExtPackHelperApp.exe"/>
+<?endif ?>
+<?if $(env.VBOX_WITH_DTRACE) = "yes" ?>
+        <File Id="file_VBoxDTrace.exe" Name="VBoxDTrace.exe"
+          Source="$(env.PATH_OUT)\bin\VBoxDTrace.exe" />
 <?endif ?>
         <!-- VBox DLL files -->