Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 45469)
+++ /trunk/Config.kmk	(revision 45470)
@@ -95,5 +95,5 @@
  INST_TESTCASE        = $(INST_BIN)testcase/
  INST_ADDITIONS       = $(INST_DIST)additions/
- INST_ADDITIONS_ISO   = $(INST_BIN)
+ INST_ADDITIONS_ISO   = $(INST_ADDITIONS)
 
  # other paths
Index: /trunk/src/VBox/Additions/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/Makefile.kmk	(revision 45469)
+++ /trunk/src/VBox/Additions/Makefile.kmk	(revision 45470)
@@ -159,5 +159,13 @@
  # (VBOX_WITHOUT_ADDITIONS_ISO is used by the additions build box, see the root makefile.)
  ifndef VBOX_WITHOUT_ADDITIONS_ISO
-  PACKING += $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.zip
+
+  ifdef VBOX_WITH_ADDITIONS_ISO.darwin.x86
+    PACKING += $(VBOX_PATH_DIST)/additions/VBoxGuestAdditions.zip
+  else ifdef VBOX_WITH_ADDITIONS_ISO.darwin.amd64
+    PACKING += $(VBOX_PATH_DIST)/additions/VBoxGuestAdditions.zip
+  else
+    PACKING += $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.zip
+  endif
+
  endif
 endif # !VBOX_ONLY_TESTSUITE
@@ -175,5 +183,5 @@
 # Darwin / Mac OS X
 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.x86
- VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/bin/additions
+ VBOX_PATH_ADDITIONS.darwin.x86 = $(PATH_OUT_BASE)/darwin.x86/$(KBUILD_TYPE)/dist/additions
  # or dmg?
  GUESTADDITIONS_FILESPEC.darwin.x86 = \
@@ -182,5 +190,5 @@
 
 ifdef VBOX_WITH_ADDITIONS_ISO.darwin.amd64
- VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/bin/additions
+ VBOX_PATH_ADDITIONS.darwin.amd64 = $(PATH_OUT_BASE)/darwin.amd64/$(KBUILD_TYPE)/dist/additions
  GUESTADDITIONS_FILESPEC.darwin.amd64 = \
 	VBoxDarwinAdditions-amd64.run=$(VBOX_PATH_ADDITIONS.darwin.amd64)/VBoxDarwinAdditions-amd64.run
Index: /trunk/src/VBox/Additions/darwin/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/darwin/Makefile.kmk	(revision 45469)
+++ /trunk/src/VBox/Additions/darwin/Makefile.kmk	(revision 45470)
@@ -5,5 +5,5 @@
 
 #
-# Copyright (C) 2010-2012 Oracle Corporation
+# Copyright (C) 2010-2013 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19,8 +19,8 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-$(PATH_STAGE_BIN)/additions/VBoxDawrinAdditions-x86.run:
+$(VBOX_PATH_ADDITIONS)/VBoxDarwinAdditions-x86.run:
 	touch $@
 
-$(PATH_STAGE_BIN)/additions/VBoxDawrinAdditions-amd64.run:
+$(VBOX_PATH_ADDITIONS)/VBoxDarwinAdditions-amd64.run:
 	touch $@