diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 8370eb62..d9558a4f 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -16,7 +16,7 @@ PREFERRED_VERSION_linux-yocto = "3.8%"
 
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
+           ${XSERVER_IA32_FBDEV} \
            "
 
 # Syslinux does not know about the 64MHz uart clock and it does not detect the
diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
index da4fc3c6..bda3535a 100644
--- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
+++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
@@ -1,6 +1,6 @@
 Section "Device"
     Identifier	"Generic VESA"
-    Driver	"vesa"
+    Driver	"fbdev"
 EndSection
 
 Section "Monitor"