diff --git a/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk b/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk
index ca52f34ca9..a73985e592 100644
--- a/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk
+++ b/repos/ports/lib/mk/spec/x86_64/virtualbox6-devices.mk
@@ -1,18 +1,17 @@
 include $(REP_DIR)/lib/mk/virtualbox6-common.inc
 
+SRC_CC += Devices/Audio/AudioHlp.cpp
 SRC_CC += Devices/Audio/AudioMixBuffer.cpp
 SRC_CC += Devices/Audio/AudioMixer.cpp
-SRC_CC += Devices/Audio/DevHDA.cpp
-SRC_CC += Devices/Audio/DevHDACommon.cpp
+SRC_CC += Devices/Audio/DevHda.cpp
+SRC_CC += Devices/Audio/DevHdaCodec.cpp
+SRC_CC += Devices/Audio/DevHdaCommon.cpp
+SRC_CC += Devices/Audio/DevHdaStream.cpp
+SRC_CC += Devices/Audio/DevHdaStreamChannel.cpp
+SRC_CC += Devices/Audio/DevHdaStreamMap.cpp
 SRC_CC += Devices/Audio/DevIchAc97.cpp
-SRC_CC += Devices/Audio/DrvAudioCommon.cpp
 SRC_CC += Devices/Audio/DrvAudio.cpp
-SRC_CC += Devices/Audio/DrvHostNullAudio.cpp
-SRC_CC += Devices/Audio/HDACodec.cpp
-SRC_CC += Devices/Audio/HDAStream.cpp
-SRC_CC += Devices/Audio/HDAStreamChannel.cpp
-SRC_CC += Devices/Audio/HDAStreamMap.cpp
-SRC_CC += Devices/Audio/HDAStreamPeriod.cpp
+SRC_CC += Devices/Audio/DrvHostAudioNull.cpp
 SRC_CC += Devices/Bus/DevPCI.cpp
 SRC_CC += Devices/Bus/DevPciIch9.cpp
 SRC_CC += Devices/Bus/MsiCommon.cpp
diff --git a/repos/ports/ports/virtualbox6.hash b/repos/ports/ports/virtualbox6.hash
index ea78718a97..d21863098f 100644
--- a/repos/ports/ports/virtualbox6.hash
+++ b/repos/ports/ports/virtualbox6.hash
@@ -1 +1 @@
-0cabc6a3f8e2884326dabeb1768916704dfdd115
+3a07749ccbdefed104b9a499c1917c55022bf0d0
diff --git a/repos/ports/ports/virtualbox6.port b/repos/ports/ports/virtualbox6.port
index f468bd8838..a49bdd4794 100644
--- a/repos/ports/ports/virtualbox6.port
+++ b/repos/ports/ports/virtualbox6.port
@@ -1,17 +1,17 @@
 LICENSE         := GPLv2
-VERSION         := 6.1.18
+VERSION         := 6.1.22
 DOWNLOADS       := virtualbox.archive virtualbox_sdk.archive
 
 VIRTUALBOX_TBZ2    := VirtualBox-$(VERSION).tar.bz2
-VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-142142.zip
+VIRTUALBOX_SDK_ZIP := VirtualBoxSDK-$(VERSION)-144080.zip
 
 URL(virtualbox) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_TBZ2)
 DIR(virtualbox) := src/virtualbox6
-SHA(virtualbox) := 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
+SHA(virtualbox) := 99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49
 
 URL(virtualbox_sdk) := http://download.virtualbox.org/virtualbox/$(VERSION)/$(VIRTUALBOX_SDK_ZIP)
 DIR(virtualbox_sdk) := src/virtualbox6_sdk
-SHA(virtualbox_sdk) := 49f8396e2a3295682f36250df91f4ffd64696cbc661ad03e8e3726459ac49b7f
+SHA(virtualbox_sdk) := 15e0829259e2cb2a976da1957c69fabdfaf6e1d4b2a169ec7c243a6c757332b2
 
 PATCHES_DIR := src/virtualbox6/patches
 PATCHES     := $(addprefix $(PATCHES_DIR)/, $(shell cat $(REP_DIR)/$(PATCHES_DIR)/series))
diff --git a/repos/ports/recipes/pkg/vbox6/hash b/repos/ports/recipes/pkg/vbox6/hash
new file mode 100644
index 0000000000..cd749f3312
--- /dev/null
+++ b/repos/ports/recipes/pkg/vbox6/hash
@@ -0,0 +1 @@
+2021-06-02 a9f9174808781fa1ab82c1e61a2debc62f2406dc
diff --git a/repos/ports/run/virtualbox6.run b/repos/ports/run/virtualbox6.run
index 82a2f562a7..6441921fc5 100644
--- a/repos/ports/run/virtualbox6.run
+++ b/repos/ports/run/virtualbox6.run
@@ -15,6 +15,7 @@ lappend depot_archives [depot_user]/pkg/themed_wm
 lappend depot_archives [depot_user]/src/[base_src]
 lappend depot_archives [depot_user]/src/clipboard
 lappend depot_archives [depot_user]/src/init
+lappend depot_archives [depot_user]/src/jpeg
 lappend depot_archives [depot_user]/src/libc
 lappend depot_archives [depot_user]/src/nitpicker
 lappend depot_archives [depot_user]/src/report_rom