diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index aabc131..69774f4 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -12,7 +12,7 @@ XSERVER = " \
     xf86-input-evdev \
     xf86-input-mouse \
     xf86-input-keyboard \
-    xf86-video-fbdev \
+    ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \
     "
 
 # Really supported starting from linux-raspberrypi 3.18.y only
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index b182388..9c5df99 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,4 +1,2 @@
 PACKAGECONFIG_append_rpi = " gallium"
 GALLIUMDRIVERS_rpi = "vc4"
-DRIDRIVERS_rpi = ""
-