diff --git a/features.in/vmguest/config.mk b/features.in/vmguest/config.mk
index 42116153..eb7dc071 100644
--- a/features.in/vmguest/config.mk
+++ b/features.in/vmguest/config.mk
@@ -6,9 +6,9 @@ ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/vmguest:
 	@$(call add_feature)
 
-use/vmguest/base: use/vmguest/vbox use/vmguest/vmware; @:
+use/vmguest/base: use/vmguest/vbox use/vmguest/vmware use/vmguest/kvm; @:
 use/vmguest/complete: use/vmguest/base \
-	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm; @:
+	use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @:
 
 use/vmguest/vbox: use/vmguest
 	@$(call add,THE_KMODULES,virtualbox-addition vboxguest)
@@ -20,7 +20,10 @@ use/vmguest/vbox/x11: use/vmguest/vbox
 # NB: only reasonable for X11-bearing images
 # see also use/install2/kvm
 use/vmguest/kvm: use/vmguest
-	@$(call add,THE_PACKAGES,spice-vdagent qemu-guest-agent)
+	@$(call add,THE_PACKAGES,qemu-guest-agent)
+
+use/vmguest/kvm/x11: use/vmguest/kvm
+	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl)
 
 # see also use/install2/vmware
 use/vmguest/vmware: