diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 221c029a..9270cbb1 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-fbdev \
            xf86-input-keyboard"
 
 # Default to external video, change to smallscreen for built-in LCD
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index 789199d9..d9706066 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -10,9 +10,8 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
-           xserver-xorg-module-exa \
            xf86-input-evdev \
-           xf86-video-omap"
+           xf86-video-fbdev"
 
 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r4"