diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index da795cd430..734e5b5469 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -15,9 +15,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg-lite"
+XSERVER ?= "xserver-xorg-lite \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
similarity index 100%
rename from meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend
rename to meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend