diff --git a/kali-config/common/package-lists/firmware.list.chroot b/kali-config/common/package-lists/hardware-support.list.chroot
similarity index 50%
rename from kali-config/common/package-lists/firmware.list.chroot
rename to kali-config/common/package-lists/hardware-support.list.chroot
index 0d8d011..f25e7f7 100644
--- a/kali-config/common/package-lists/firmware.list.chroot
+++ b/kali-config/common/package-lists/hardware-support.list.chroot
@@ -8,3 +8,12 @@
 firmware-b43legacy-installer
 firmware-b43-installer
 #endif
+
+##
+## Make sure we install as many video drivers as we can. Note that
+## this package needs to be explicitly listed if we want to be sure that
+## it's installed. Installing xserver-xorg is not enough to make sure,
+## due to its dependencies, defined as such:
+##  * xserver-xorg-video-all | xorg-driver-video
+##
+xserver-xorg-video-all
diff --git a/kali-config/common/package-lists/virtualization.list.chroot b/kali-config/common/package-lists/virtualization.list.chroot
index 6d197ea..f0bf5f3 100644
--- a/kali-config/common/package-lists/virtualization.list.chroot
+++ b/kali-config/common/package-lists/virtualization.list.chroot
@@ -1,7 +1,5 @@
 ##
 ## Install packages required for virtualization support.
-## Note that xserver-xorg-video-all needs to be explicitly stated, otherwise
-## we only get the vmware video driver (pulled in by open-vm-tools-desktop).
 ##
 #if ARCHITECTURES amd64 i386
 open-vm-tools-desktop
@@ -10,4 +8,3 @@ hyperv-daemons
 #endif
 qemu-guest-agent
 spice-vdagent
-xserver-xorg-video-all