--- Makefile.kmk.orig	2020-07-10 02:49:46.000000000 +1000
+++ Makefile.kmk	2020-08-17 22:12:41.555681000 +1000
@@ -592,6 +592,7 @@
 	src/VBox/HostServices/auth/winlogon \
 	src/VBox/HostDrivers/Support \
 	src/VBox/HostDrivers/Support/darwin \
+	src/VBox/HostDrivers/Support/bsdsunix \
 	src/VBox/HostDrivers/Support/freebsd \
 	src/VBox/HostDrivers/Support/linux \
 	src/VBox/HostDrivers/Support/os2 \
@@ -679,6 +680,7 @@
 	src/VBox/Additions/common \
 	src/VBox/Additions/common/VBoxControl \
 	src/VBox/Additions/common/VBoxGuest \
+	src/VBox/Additions/common/VBoxGuest/bsdsunix \
 	src/VBox/Additions/common/VBoxGuest/freebsd \
 	src/VBox/Additions/common/VBoxGuest/linux \
 	src/VBox/Additions/common/VBoxGuest/win \
@@ -692,6 +694,10 @@
 	src/VBox/Additions/common/crOpenGL/passthrough \
 	src/VBox/Additions/common/pam \
 	src/VBox/Additions/darwin \
+	src/VBox/Additions/bsdsunix \
+	src/VBox/Additions/bsdsunix/Installer \
+	src/VBox/Additions/bsdsunix/drm \
+	src/VBox/Additions/bsdsunix/vboxvfs \
 	src/VBox/Additions/freebsd \
 	src/VBox/Additions/freebsd/Installer \
 	src/VBox/Additions/freebsd/drm \
@@ -959,7 +965,7 @@
 	--exclude=tinderclient.log \
 	--exclude=tools/FetchDir/ \
 	--exclude=webtools/ \
-	$(foreach os,darwin freebsd linux solaris os2 win,$(if-expr "$(1)" != "$(os)", \
+	$(foreach os,darwin bsdsunix freebsd linux solaris os2 win,$(if-expr "$(1)" != "$(os)", \
 		--exclude=tools/$(os).x86/ \
 		--exclude=tools/$(os).amd64/ \
 		--exclude=out/$(os).amd64/ \
@@ -982,6 +988,8 @@
 VBOX_BLD_VM_WIN_AMD64_IP         := 192.168.27.16
 VBOX_BLD_VM_FBSD_X86_IP          := 192.168.27.7
 VBOX_BLD_VM_FBSD_AMD64_IP        := 192.168.27.17
+VBOX_BLD_VM_BSDSUX_X86_IP        := 192.168.27.9
+VBOX_BLD_VM_BSDSUX_AMD64_IP      := 192.168.27.19
 
 VBOX_WITH_OS2_ADD_BUILD=1
 
@@ -1210,6 +1218,8 @@
 
 additions-packing:
 	+ $(KMK) VBOX_ONLY_ADDITIONS=1 \
+		VBOX_WITH_ADDITIONS_ISO.bsdsunix.amd64= \
+		VBOX_WITH_ADDITIONS_ISO.bsdsunix.x86= \
 		VBOX_WITH_ADDITIONS_ISO.freebsd.amd64= \
 		VBOX_WITH_ADDITIONS_ISO.freebsd.x86= \
 		VBOX_WITH_ADDITIONS_ISO.linux.amd64= \
@@ -1249,6 +1259,8 @@
 	+ $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
 	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
 	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
+#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=bsdsunix BUILD_TARGET_ARCH=amd64 BUILD_TARGET=bsdsunix  VBOX_ONLY_EXTPACKS=1
+#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=bsdsunix BUILD_TARGET_ARCH=x86   BUILD_TARGET=bsdsunix  VBOX_ONLY_EXTPACKS=1
 #	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
 #	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
 	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
@@ -1266,6 +1278,8 @@
 	extpacks-build-os2.x86 \
 	extpacks-build-linux \
 	extpacks-build-darwin.amd64 \
+	extpacks-build-bsdsunix.amd64 \
+	extpacks-build-bsdsunix.x86 \
 	extpacks-build-freebsd.amd64 \
 	extpacks-build-freebsd.x86
 
@@ -1370,6 +1384,24 @@
 extpacks-build-linux: extpacks-build-linux.rsync-out-of-vm
 endif
 
+extpacks-build-bsdsunix.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),bsdsunix.amd64)
+#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+#else
+#	$(call VBOX_BLD_VM_MSG_BEGIN,BSDSUniX/amd64 extension packs)
+#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_BSDSUX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+#	$(call VBOX_BLD_VM_MSG_END__,BSDSUniX/amd64 extension packs)
+#endif
+
+extpacks-build-bsdsunix.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
+#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),bsdsunix.x86)
+#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
+#else
+#	$(call VBOX_BLD_VM_MSG_BEGIN,BSDSUniX/x86 extension packs)
+#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_BSDSUX_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+#	$(call VBOX_BLD_VM_MSG_END__,BSDSUniX/x86 extension packs)
+#endif
+
 extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
 #	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
@@ -1413,6 +1445,8 @@
 	extpacks-build-linux \
 	extpacks-build-linux.amd64 \
 	extpacks-build-linux.x86 \
+	extpacks-build-bsdsunix.amd64 \
+	extpacks-build-bsdsunix.x86 \
 	extpacks-build-freebsd.amd64 \
 	extpacks-build-freebsd.x86 \
 	extpacks-build-darwin.amd64 \
@@ -1429,6 +1463,8 @@
 	+ $(KMK) -C tools fetch VBOX_ONLY_VALIDATIONKIT=1
 	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin    VBOX_ONLY_VALIDATIONKIT=1
 	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin    VBOX_ONLY_VALIDATIONKIT=1
+#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=bsdsunix BUILD_TARGET_ARCH=amd64 BUILD_TARGET=bsdsunix   VBOX_ONLY_VALIDATIONKIT=1
+#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=bsdsunix BUILD_TARGET_ARCH=x86   BUILD_TARGET=bsdsunix   VBOX_ONLY_VALIDATIONKIT=1
 #	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd   VBOX_ONLY_VALIDATIONKIT=1
 #	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd   VBOX_ONLY_VALIDATIONKIT=1
 	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux     VBOX_ONLY_VALIDATIONKIT=1
@@ -1448,6 +1484,8 @@
 	validationkit-build-win.amd64 \
 	validationkit-build-os2.x86 \
 	validationkit-build-linux \
+	validationkit-build-bsdsunix.amd64 \
+	validationkit-build-bsdsunix.x86 \
 	validationkit-build-freebsd.amd64 \
 	validationkit-build-freebsd.x86 \
 	validationkit-build-darwin.amd64 \
@@ -1595,6 +1633,24 @@
 validationkit-build-linux: validationkit-build-linux.rsync-out-of-vm
 endif
 
+validationkit-build-bsdsunix.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
+#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),bsdsunix.amd64)
+#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+#else
+#	$(call VBOX_BLD_VM_MSG_BEGIN,Bsdsunix/amd64 Validation Kit)
+#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_BSDSUX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all"
+#	$(call VBOX_BLD_VM_MSG_END__,Bsdsunix/amd64 Validation Kit)
+#endif
+
+validationkit-build-bsdsunix.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
+#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),bsdsunix.x86)
+#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
+#else
+#	$(call VBOX_BLD_VM_MSG_BEGIN,Bsdsunix/x86 Validation Kit)
+#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_BSDSUX_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
+#	$(call VBOX_BLD_VM_MSG_END__,Bsdsunix/x86 Validation Kit)
+#endif
+
 validationkit-build-freebsd.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
 #ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
 #	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
@@ -1640,6 +1696,8 @@
 	+ $(KMK) VBOX_ONLY_VALIDATIONKIT=1 \
 		VBOX_WITH_VALIDATIONKIT_PACKING.darwin.amd64=1 \
 		VBOX_WITH_VALIDATIONKIT_PACKING.darwin.x86=2 \
+		VBOX_WITH_VALIDATIONKIT_PACKING.bsdsunix.amd64= \
+		VBOX_WITH_VALIDATIONKIT_PACKING.bsdsunix.x86= \
 		VBOX_WITH_VALIDATIONKIT_PACKING.freebsd.amd64= \
 		VBOX_WITH_VALIDATIONKIT_PACKING.freebsd.x86= \
 		VBOX_WITH_VALIDATIONKIT_PACKING.linux.amd64=1 \
@@ -1662,6 +1720,8 @@
 	validationkit-build-linux \
 	validationkit-build-linux.amd64 \
 	validationkit-build-linux.x86 \
+	validationkit-build-bsdsunix.amd64 \
+	validationkit-build-bsdsunix.x86 \
 	validationkit-build-freebsd.amd64 \
 	validationkit-build-freebsd.x86 \
 	validationkit-build-darwin.amd64 \