Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 38027)
+++ /trunk/Config.kmk	(revision 38028)
@@ -66,8 +66,33 @@
 VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
 
-# Install paths.
-PATH_INS              = $(PATH_OUT)
+# Install paths
+## @todo This will change after 4.1 is branched off!
+# What is now 'bin' and 'lib' will be moved down under 'staged/', except on
+# darwin where it's currently called 'dist' which will be renamed to 'staged'.
+# When running 'kmk install' files will be copied to 'dist/', on unix systems
+# this will be done in FHS fashion assuming /usr/local or /usr as 'prefix'.
+#
+# Changes related to this are marked VBOX_WITH_NEW_LAYOUT, while changes marked
+# VBOX_WITH_0_2_0_KBUILD are for building with current kBuild svn.
+if $(KMK_REVISION) >= 2475 \
+ && $(KBUILD_VERSION_MAJOR) == 0 \
+ && (   ($(KBUILD_VERSION_MINOR) == 1 && $(KBUILD_VERSION_PATCH) >= 99) \
+     || $(KBUILD_VERSION_MINOR) >= 2)
+ VBOX_WITH_0_2_0_KBUILD = 1
+endif
+ifndef VBOX_WITH_NEW_LAYOUT
+ PATH_STAGE           = $(PATH_OUT)
+ ifdef VBOX_WITH_0_2_0_KBUILD
+  PATH_INS            = $(PATH_OUT)/dist
+ else
+  PATH_INS            = $(PATH_OUT)
+ endif
+endif
 ifeq ($(KBUILD_TARGET),darwin)
- INST_DIST            = dist/
+ ifndef VBOX_WITH_NEW_LAYOUT
+  INST_DIST           = dist/
+ else
+  INST_DIST          :=
+ endif
  INST_SDK             = $(INST_DIST)sdk/